svn commit: r773650 - in /synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp: HttpCoreNIOSender.java util/NhttpUtil.java

[ruwan]

Author: ruwan
Date: Mon May 11 18:38:20 2009
New Revision: 773650

URL: http://svn.apache.org/viewvc?rev=773650&view=rev
Log:
applying patch for SYNAPSE-546, thanks Amila for the improvement

Modified:
    
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
    
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/NhttpUtil.java

Modified: 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java?rev=773650&r1=773649&r2=773650&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
 (original)
+++ 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
 Mon May 11 18:38:20 2009
@@ -270,7 +270,7 @@
 
         EndpointReference epr = NhttpUtil.getDestinationEPR(msgContext);
         if (epr != null) {
-            if 
(!AddressingConstants.Final.WSA_NONE_URI.equals(epr.getAddress())) {
+            if (!epr.hasNoneAddress()) {
                 sendAsyncRequest(epr, msgContext);
             } else {
                 handleException("Cannot send message to " + 
AddressingConstants.Final.WSA_NONE_URI);

Modified: 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/NhttpUtil.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/NhttpUtil.java?rev=773650&r1=773649&r2=773650&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/NhttpUtil.java
 (original)
+++ 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/NhttpUtil.java
 Mon May 11 18:38:20 2009
@@ -18,14 +18,12 @@
 */
 package org.apache.synapse.transport.nhttp.util;
 
+import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.Constants;
-import org.apache.axis2.transport.base.BaseUtils;
-import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.axis2.transport.TransportUtils;
-import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axis2.transport.http.HTTPConstants;
 
 import java.net.InetAddress;
 
@@ -83,11 +81,7 @@
         if (transportURL != null) {
             return new EndpointReference(transportURL);
         } else if (
-            (msgContext.getTo() != null) &&
-                !AddressingConstants.Submission.WSA_ANONYMOUS_URL.equals(
-                    msgContext.getTo().getAddress()) &&
-                !AddressingConstants.Final.WSA_ANONYMOUS_URL.equals(
-                    msgContext.getTo().getAddress())) {
+            (msgContext.getTo() != null) && 
!msgContext.getTo().hasAnonymousAddress()) {
             return msgContext.getTo();
         }
         return null;