You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by as...@apache.org on 2007/03/01 08:29:11 UTC

svn commit: r513209 - /webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java

Author: asankha
Date: Wed Feb 28 23:29:10 2007
New Revision: 513209

URL: http://svn.apache.org/viewvc?view=rev&rev=513209
Log:
detect default http and https port correctly from a url

Modified:
    webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java

Modified: webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java?view=diff&rev=513209&r1=513208&r2=513209
==============================================================================
--- webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java (original)
+++ webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java Wed Feb 28 23:29:10 2007
@@ -199,15 +199,24 @@
     private void sendAsyncRequest(EndpointReference epr, MessageContext msgContext) throws AxisFault {
         try {
             URL url = new URL(epr.getAddress());
-            HttpHost httpHost = new HttpHost(url.getHost(), url.getPort(), url.getProtocol());
+            int port = url.getPort();
+            if (port == -1) {
+                // use default
+                if ("http".equals(url.getProtocol())) {
+                    port = 80;
+                } else if ("https".equals(url.getProtocol())) {
+                    port = 443;
+                }
+            }
+            HttpHost httpHost = new HttpHost(url.getHost(), port, url.getProtocol());
 
             Axis2HttpRequest axis2Req = new Axis2HttpRequest(epr, httpHost, msgContext);
 
-            NHttpClientConnection conn = ConnectionPool.getConnection(url.getHost(), url.getPort());
+            NHttpClientConnection conn = ConnectionPool.getConnection(url.getHost(), port);
 
             if (conn == null) {
                 SessionRequest req = ioReactor.connect(
-                    new InetSocketAddress(url.getHost(), url.getPort()), null, axis2Req);
+                    new InetSocketAddress(url.getHost(), port), null, axis2Req);
                 log.debug("A new connection established");
             } else {
                 ((ClientHandler) handler).submitRequest(conn, axis2Req);



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