svn commit: r1005915 - /axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java

[nthaker]

Author: nthaker
Date: Fri Oct  8 17:23:00 2010
New Revision: 1005915

URL: http://svn.apache.org/viewvc?rev=1005915&view=rev
Log:
JIRA- AXIS2-4845
The change addresses a performance problem in AddressingInHandler. code 
contributed by Doug Larson.

Currently, we first check to see if there is a parameter to disable inbound 
addressing which is normally false but then we find out there are no soap 
headers anyway. The change moves the check for soap headers before we check to 
see if there is a parameter to disable inbound addressing. 

Modified:
    
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java

Modified: 
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java?rev=1005915&r1=1005914&r2=1005915&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
 Fri Oct  8 17:23:00 2010
@@ -75,6 +75,12 @@ public class AddressingInHandler extends
         msgContext.setProperty(DISABLE_ADDRESSING_FOR_OUT_MESSAGES, 
Boolean.TRUE);
         msgContext.setProperty(IS_ADDR_INFO_ALREADY_PROCESSED, Boolean.FALSE);
 
+
+        // if there are not headers put a flag to disable addressing temporary
+        SOAPHeader header = msgContext.getEnvelope().getHeader();
+        if (header == null) {
+            return InvocationResponse.CONTINUE;
+        }
         //Determine if we want to ignore addressing headers. This parameter 
must
         //be retrieved from the message context because it's value can vary on 
a
         //per service basis.
@@ -88,11 +94,6 @@ public class AddressingInHandler extends
             return InvocationResponse.CONTINUE;         
         }
 
-        // if there are not headers put a flag to disable addressing temporary
-        SOAPHeader header = msgContext.getEnvelope().getHeader();
-        if (header == null) {
-            return InvocationResponse.CONTINUE;
-        }
 
         if(configuration == null){
                AxisConfiguration conf = 
msgContext.getConfigurationContext().getAxisConfiguration();