[jboss-svn-commits] JBL Code SVN: r25047 - labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/http/configurators.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2009-02-02 05:44:11 -0500 (Mon, 02 Feb 2009)
New Revision: 25047

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/http/configurators/HttpProtocol.java
Log:
Fix default port number for https: JBESB-2327

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/http/configurators/HttpProtocol.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/http/configurators/HttpProtocol.java	2009-02-02 10:21:27 UTC (rev 25046)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/http/configurators/HttpProtocol.java	2009-02-02 10:44:11 UTC (rev 25047)
@@ -77,7 +77,7 @@
         URI targetURI = getTargetURI(properties, true);
         String factory;
         String scheme = targetURI.getScheme();
-        int port = 80; //default to http;
+        final int port ;
         org.apache.commons.httpclient.protocol.Protocol protocol;
         KeyMaterial keyMaterial = null;
         ProtocolSocketFactory socketFactory;
@@ -92,12 +92,12 @@
             keyMaterial = getKeyMaterial(properties);
             setHttpsProxyHost(httpClient, properties);
 
-            if(port == -1) {
-                port = 443;
-            }
+            port = 443;
         } else {
             factory = properties.getProperty("protocol-socket-factory", DefaultProtocolSocketFactory.class.getName());
             setHttpProxyHost(httpClient, properties);
+
+            port = 80;
         }
         assertPropertySetAndNotBlank(factory, "protocol-socket-factory");
         socketFactory = createFactoryClass(factory, keyMaterial, properties);