You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pr...@apache.org on 2010/02/02 15:36:04 UTC

svn commit: r905648 - in /webservices/axis2/trunk/java/modules: addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java integration/test/org/apache/axis2/addressing/MultiHopRedirectService1.java

Author: pradine
Date: Tue Feb  2 14:36:04 2010
New Revision: 905648

URL: http://svn.apache.org/viewvc?rev=905648&view=rev
Log:
Applying patch for http://issues.apache.org/jira/browse/AXIS2-4601

Modified:
    webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectService1.java

Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?rev=905648&r1=905647&r2=905648&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java Tue Feb  2 14:36:04 2010
@@ -452,7 +452,7 @@
                     epr = new EndpointReference(anonymous);
                 }
             }
-            else if (!isFinalAddressingNamespace && epr.hasNoneAddress()) {
+            else if ((!isFinalAddressingNamespace || messageContext.isServerSide()) && epr.hasNoneAddress()) {
                 return; //Omit the header.
             }
             else if (epr.isWSAddressingAnonymous())

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectService1.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectService1.java?rev=905648&r1=905647&r2=905648&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectService1.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectService1.java Tue Feb  2 14:36:04 2010
@@ -32,6 +32,7 @@
         currOutMc.setTo(new EndpointReference("http://127.0.0.1:" + (UtilServer.TESTING_PORT) +
                 "/axis2/services/MultiHopRedirectService2/echoRedirect"));
         currOutMc.setReplyTo(currInMc.getReplyTo());
+        currOutMc.setServerSide(false);
         return ome;
     }
 }