[java-opensaml] 05/16: Always make HttpClientContext available in outbound message context.

[Brent Putman]

This is an automated email from the git hooks/post-receive script.

putmanb pushed a commit to branch master
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=3ddd2d91d2757444b9e2a78cc0633f8d8ae9e0a8

commit 3ddd2d91d2757444b9e2a78cc0633f8d8ae9e0a8
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Wed Sep 19 22:34:50 2018 -0400

    Always make HttpClientContext available in outbound message context.
---
 .../soap/client/http/AbstractPipelineHttpSOAPClient.java         | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/AbstractPipelineHttpSOAPClient.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/AbstractPipelineHttpSOAPClient.java
index ab6022a..38f3c9d 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/AbstractPipelineHttpSOAPClient.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/AbstractPipelineHttpSOAPClient.java
@@ -411,12 +411,11 @@ public abstract class AbstractPipelineHttpSOAPClient<OutboundMessageType, Inboun
      */
     @Nonnull protected HttpClientContext resolveClientContext(@Nonnull final InOutOperationContext operationContext) {
         final HttpClientRequestContext requestContext = 
-                operationContext.getOutboundMessageContext().getSubcontext(HttpClientRequestContext.class);
-        if (requestContext != null && requestContext.getHttpClientContext() != null) {
-            return requestContext.getHttpClientContext();
-        } else {
-            return HttpClientContext.create();
+                operationContext.getOutboundMessageContext().getSubcontext(HttpClientRequestContext.class, true);
+        if (requestContext.getHttpClientContext() == null) {
+            requestContext.setHttpClientContext(HttpClientContext.create());
         }
+        return requestContext.getHttpClientContext();
     }
 
     /**

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.