axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prad...@apache.org
Subject svn commit: r644777 - /webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
Date Fri, 04 Apr 2008 17:10:53 GMT
Author: pradine
Date: Fri Apr  4 10:10:47 2008
New Revision: 644777

URL: http://svn.apache.org/viewvc?rev=644777&view=rev
Log:
Seems we need to check the WS_ADDRESSING_VERSION property as well as the parameter.

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

Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java?rev=644777&r1=644776&r2=644777&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
(original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
Fri Apr  4 10:10:47 2008
@@ -100,10 +100,16 @@
         	configuration = conf;
         }
         
-        // check whether someone has explicitly set which addressing namespace to expect.
+        // check whether another handler has explicitly set which addressing namespace to
expect.
         Iterator iterator = null;
-        Parameter namespaceParam = msgContext.getParameter(WS_ADDRESSING_VERSION);
-        String namespace = Utils.getParameterValue(namespaceParam);
+        String namespace = (String) msgContext.getProperty(WS_ADDRESSING_VERSION);
+        
+        // check whether the service is configured to use a particular version of WS-Addressing,
+        // e.g. via JAX-WS annotations.
+        if (namespace == null) {
+            Parameter namespaceParam = msgContext.getParameter(WS_ADDRESSING_VERSION);
+            namespace = Utils.getParameterValue(namespaceParam);
+        }
         
         if (namespace == null) {
             namespace = Final.WSA_NAMESPACE;



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message