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

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Jun 10 19:14:14 2015
New Revision: 4299

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4299&view=rev
Log:
Fix impl of isSOAPMessage().  The impl was still the v2 version and isn't correct for v3.  Fortunately nothing is using currently.

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=4299&r1=4298&r2=4299&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	Wed Jun 10 19:14:14 2015
@@ -109,14 +109,13 @@
     public static boolean isSOAPMessage(@Nonnull final MessageContext<? extends XMLObject> messageContext) {
         Constraint.isNotNull(messageContext, "Message context cannot be null");
         
-        XMLObject inboundMessage = messageContext.getMessage();
-        if (inboundMessage == null) {
-            return false;
-        }
+        final SOAP11Context soap11 = getSOAP11Context(messageContext, false);
+        
         // SOAP 1.1 Envelope
-        if (inboundMessage instanceof Envelope) {
+        if (soap11 != null && soap11.getEnvelope() != null) {
             return true;
         }
+        
         //TODO SOAP 1.2 support when object providers are implemented
         return false;
     }