[java-opensaml COMMIT] /trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/util/SOAPSupport.java

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jul 14 23:09:57 2014
New Revision: 3947

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3947&view=rev
Log:
Add null checks.

Modified:
    trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/util/SOAPSupport.java

Modified: trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/util/SOAPSupport.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/util/SOAPSupport.java?rev=3947&r1=3946&r2=3947&view=diff
==============================================================================
--- trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/util/SOAPSupport.java (original)
+++ trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/util/SOAPSupport.java Mon Jul 14 23:09:57 2014
@@ -410,8 +410,8 @@
         Constraint.isNotNull(messageContext, "Message context cannot be null");
         
         // SOAP 1.1 Envelope
-        SOAP11Context soap11 = messageContext.getSubcontext(SOAP11Context.class, false);
-        if (soap11 != null) {
+        final SOAP11Context soap11 = messageContext.getSubcontext(SOAP11Context.class);
+        if (soap11 != null && soap11.getEnvelope() != null) {
             addSOAP11HeaderBlock(soap11.getEnvelope(), headerBlock);
         } else {
             //TODO SOAP 1.2 support when object providers are implemented
@@ -455,10 +455,10 @@
             @Nullable Set<String> targetNodes, boolean isFinalDestination) {
         Constraint.isNotNull(messageContext, "Message context cannot be null");
         
-        SOAP11Context soap11 = messageContext.getSubcontext(SOAP11Context.class, false);
+        final SOAP11Context soap11 = messageContext.getSubcontext(SOAP11Context.class);
         
         // SOAP 1.1 Envelope
-        if (soap11 != null) {
+        if (soap11 != null && soap11.getEnvelope() != null) {
             return getSOAP11HeaderBlock(soap11.getEnvelope(), headerName, targetNodes, isFinalDestination);
         }