[java-opensaml COMMIT] /trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/messaging/SOAPMessagingSupport.java

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Nov  6 16:23:12 2015
New Revision: 4395

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4395&view=rev
Log:
Minor fixes to SOAP messaging support code.

Modified:
    trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/messaging/SOAPMessagingSupport.java

Modified: trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/messaging/SOAPMessagingSupport.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/messaging/SOAPMessagingSupport.java?rev=4395&r1=4394&r2=4395&view=diff
==============================================================================
--- trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/messaging/SOAPMessagingSupport.java	(original)
+++ trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/messaging/SOAPMessagingSupport.java	Fri Nov  6 16:23:12 2015
@@ -114,12 +114,8 @@
     public static boolean isSOAPMessage(@Nonnull final MessageContext<? extends XMLObject> messageContext) {
         Constraint.isNotNull(messageContext, "Message context cannot be null");
         
-        if (isSOAP11Message(messageContext)) {
-            return true;
-        }
-        
-        //TODO SOAP 1.2 support when object providers are implemented
-        return false;
+        SOAPVersion version = getSOAPVersion(messageContext);
+        return version != null;
     }
     
     /**
@@ -137,15 +133,14 @@
             return true;
         }
         
-        //TODO SOAP 1.2 support when object providers are implemented
         return false;
     }
     
     /**
-     * Determine whether the SOAP version of the message represented by the message context.
-     * 
-     * @param messageContext the current message context
-     * @return the SOAP version.  May be null if the version could not be determined
+     * Determine the SOAP version of the message represented by the message context.
+     * 
+     * @param messageContext the current message context
+     * @return the SOAP version.  May be null if the version could not be determined.
      */
     @Nullable public static SOAPVersion getSOAPVersion(
             @Nonnull final MessageContext<? extends XMLObject> messageContext) {