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

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Oct 11 21:04:08 2013
New Revision: 3474

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3474&view=rev
Log:
Get rid of "Connection: close" header also.  If desired, will be handled by client's HttpRequestInterceptor.
Also allow unsetting basic auth creds by passing nulls to setter.

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=3474&r1=3473&r2=3474&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 Fri Oct 11 21:04:08 2013
@@ -142,6 +142,10 @@
             } else {
                 authScope = scope;
             }
+        } else {
+            log.debug("Either username or password were null, disabling basic auth");
+            usernamePasswordCredentials = null;
+            authScope = null;
         }
         
     }
@@ -218,8 +222,6 @@
     protected HttpGet buildHttpGet() {
         HttpGet getMethod = new HttpGet(getMetadataURI());
         
-        // TODO Connection header is already unconditionally added by our HttpClientBuilder config, keep here?
-        getMethod.addHeader("Connection", "close");
         if (cachedMetadataETag != null) {
             getMethod.setHeader("If-None-Match", cachedMetadataETag);
         }