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

[barrettj]

Author: barrettj
Date: Thu Apr  1 13:36:35 2010
New Revision: 929963

URL: http://svn.apache.org/viewvc?rev=929963&view=rev
Log:
AXIS2-4601
Patch contributed by Katherine Sanders to revert previous change made under 4601

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

Modified: 
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?rev=929963&r1=929962&r2=929963&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
 Thu Apr  1 13:36:35 2010
@@ -452,7 +452,7 @@ public class AddressingOutHandler extend
                     epr = new EndpointReference(anonymous);
                 }
             }
-            else if ((!isFinalAddressingNamespace || 
messageContext.isServerSide()) && epr.hasNoneAddress()) {
+            else if (!isFinalAddressingNamespace && epr.hasNoneAddress()) {
                 return; //Omit the header.
             }
             else if (epr.isWSAddressingAnonymous())

Modified: 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectService1.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectService1.java?rev=929963&r1=929962&r2=929963&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectService1.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectService1.java
 Thu Apr  1 13:36:35 2010
@@ -32,7 +32,6 @@ public class MultiHopRedirectService1 {
         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;
     }
 }