cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ashaki...@apache.org
Subject svn commit: r1557762 - /cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
Date Mon, 13 Jan 2014 16:12:58 GMT
Author: ashakirin
Date: Mon Jan 13 16:12:58 2014
New Revision: 1557762

URL: http://svn.apache.org/r1557762
Log:
[CXF-5387] Relax SOAPAction check in SoapActionInInterceptor

Modified:
    cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java

Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java?rev=1557762&r1=1557761&r2=1557762&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
(original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
Mon Jan 13 16:12:58 2014
@@ -191,11 +191,15 @@ public class SoapActionInInterceptor ext
 
     private static boolean isActionMatch(SoapMessage message, BindingOperationInfo boi, String
action) {
         SoapOperationInfo soi = boi.getExtensor(SoapOperationInfo.class);
+        if (soi == null) {
+            return false;
+        }
         boolean allowNoMatchingToDefault = MessageUtils.getContextualBoolean(message,
                                                                     ALLOW_NON_MATCHING_TO_DEFAULT,
                                                                     false);
-        return ((soi != null) && action.equals(soi.getAction()))
-            || ((soi != null) && allowNoMatchingToDefault && StringUtils.isEmpty(soi.getAction()));
+        return action.equals(soi.getAction())
+               || (allowNoMatchingToDefault && StringUtils.isEmpty(soi.getAction())
+               || (message.getVersion() instanceof Soap12) && StringUtils.isEmpty(soi.getAction()));
     }
 
 }



Mime
View raw message