You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pr...@apache.org on 2009/02/27 13:43:20 UTC

svn commit: r748497 - /webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java

Author: pradine
Date: Fri Feb 27 12:43:20 2009
New Revision: 748497

URL: http://svn.apache.org/viewvc?rev=748497&view=rev
Log:
Apply patch from AXIS2-4234.

Modified:
    webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java

Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java?rev=748497&r1=748496&r2=748497&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java Fri Feb 27 12:43:20 2009
@@ -50,16 +50,16 @@
         if (JavaUtils.isTrueExplicitly(flag)) {
             // Check if the wsa:MessageID is required or not.
             checkMessageIDHeader(msgContext);
+            
+            // Check that if wsamInvocationPattern flag is in effect that the replyto and faultto are valid.
+            if (JavaUtils.isTrue(msgContext.getProperty(ADDR_VALIDATE_INVOCATION_PATTERN), true)) {
+                checkWSAMInvocationPattern(msgContext);
+            }
         }
         else {
             // Check that if wsaddressing=required that addressing headers were found inbound
             checkUsingAddressing(msgContext);
         }
-        
-        // Check that if wsamInvocationPattern flag is in effect that the replyto and faultto are valid.
-        if (JavaUtils.isTrue(msgContext.getProperty(ADDR_VALIDATE_INVOCATION_PATTERN), true)) {
-            checkWSAMInvocationPattern(msgContext);
-        }
 
         return InvocationResponse.CONTINUE;
     }