QPID-4383 : Fix to set ssl based on protocol

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1400326 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 14 insertions, 1 deletions

diff --git a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
index f7c9d75d43..66cfe10771 100644
--- a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
@@ -119,23 +119,31 @@ public class ConnectionFactoryImpl implements ConnectionFactory, TopicConnection
         }
         String host = url.getHost();
         int port = url.getPort();
+
+        boolean ssl = false;
+
         if(port == -1)
         {
             if("amqps".equals(protocol))
             {
                 port = 5671;
+                ssl = true;
             }
             else
             {
                 port = 5672;
             }
         }
+        else if("amqps".equals(protocol))
+        {
+            ssl = true;
+        }
+
         String userInfo = url.getUserInfo();
         String username = null;
         String password = null;
         String clientId = null;
         String remoteHost = null;
-        boolean ssl = false;
         if(userInfo != null)
         {
             String[] components = userInfo.split(":",2);
@@ -166,6 +174,11 @@ public class ConnectionFactoryImpl implements ConnectionFactory, TopicConnection
            }
         }
 
+        if(remoteHost == null)
+        {
+            remoteHost = host;
+        }
+
         return new ConnectionFactoryImpl(host, port, username, password, clientId, remoteHost, ssl);
 
     }