[java-opensaml COMMIT] /trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/AbstractPipelineHttpSOAPC...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri May 22 18:18:29 2015
New Revision: 4275

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4275&view=rev
Log:
Prefer a credentials provider already set in the context over one configured in the client. 

Modified:
    trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/AbstractPipelineHttpSOAPClient.java

Modified: trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/AbstractPipelineHttpSOAPClient.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/AbstractPipelineHttpSOAPClient.java?rev=4275&r1=4274&r2=4275&view=diff
==============================================================================
--- trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/AbstractPipelineHttpSOAPClient.java	(original)
+++ trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/AbstractPipelineHttpSOAPClient.java	Fri May 22 18:18:29 2015
@@ -396,7 +396,7 @@
                 .getSubcontext(HttpClientSecurityContext.class, true).getSecurityParameters();
         
         CredentialsProvider credProvider = ObjectSupport.firstNonNull(
-                securityParameters.getCredentialsProvider(), credentialsProvider);
+                securityParameters.getCredentialsProvider(), context.getCredentialsProvider(), credentialsProvider);
         if (credProvider != null) {
             context.setCredentialsProvider(credProvider);
         }