[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataR...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Oct 16 21:29:08 2013
New Revision: 3477

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3477&view=rev
Log:
Eliminate a bit of unnecessary object creation on every metadata fetch.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java?rev=3477&r1=3476&r2=3477&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java Wed Oct 16 21:29:08 2013
@@ -71,11 +71,8 @@
     /** The Last-Modified information provided when the currently cached metadata was fetched. */
     private String cachedMetadataLastModified;
     
-    /** Username and password credential used for HTTP BASIC authentication. */
-    private UsernamePasswordCredentials usernamePasswordCredentials;
-    
-    /** HttpClient AuthScope instance to use. */
-    private AuthScope authScope;
+    /** HttpClient credentials provider. */
+    private BasicCredentialsProvider credentialsProvider;
     
     /**
      * Constructor.
@@ -137,16 +134,18 @@
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
 
         if (username != null && password != null) {
-            usernamePasswordCredentials = new UsernamePasswordCredentials(username, password);
-            if (scope == null) {
+            UsernamePasswordCredentials usernamePasswordCredentials = 
+                    new UsernamePasswordCredentials(username, password);
+            AuthScope authScope = scope;
+            if (authScope == null) {
                 authScope = new AuthScope(metadataURI.getHost(), metadataURI.getPort());
-            } else {
-                authScope = scope;
-            }
+            }
+            BasicCredentialsProvider provider = new BasicCredentialsProvider();
+            provider.setCredentials(authScope, usernamePasswordCredentials);
+            credentialsProvider = provider;
         } else {
             log.debug("Either username or password were null, disabling basic auth");
-            usernamePasswordCredentials = null;
-            authScope = null;
+            credentialsProvider = null;
         }
         
     }
@@ -154,8 +153,7 @@
     /** {@inheritDoc} */
     protected void doDestroy() {
         httpClient = null;
-        usernamePasswordCredentials = null;
-        authScope = null;
+        credentialsProvider = null;
         metadataURI = null;
         cachedMetadataETag = null;
         cachedMetadataLastModified = null;
@@ -248,9 +246,7 @@
      */
     protected HttpClientContext buildHttpClientContext() {
         HttpClientContext context = HttpClientContext.create();
-        if (usernamePasswordCredentials != null) {
-            BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-            credentialsProvider.setCredentials(authScope, usernamePasswordCredentials);
+        if (credentialsProvider != null) {
             context.setCredentialsProvider(credentialsProvider);
         }
         return context;