QPID-4383 : Fix connection URLs

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

3 files changed, 37 insertions, 6 deletions

diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java b/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
index d9e6dfe36d..f7c9d75d43 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
+++ b/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionFactoryImpl.java
@@ -20,8 +20,12 @@
  */
 package org.apache.qpid.amqp_1_0.jms.impl;
 
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLDecoder;
+import java.net.URLStreamHandler;
 import javax.jms.JMSException;
 import javax.jms.QueueConnection;
 import javax.jms.QueueConnectionFactory;
@@ -96,12 +100,35 @@ public class ConnectionFactoryImpl implements ConnectionFactory, TopicConnection
 
     public static ConnectionFactoryImpl createFromURL(final String urlString) throws MalformedURLException
     {
-        URL url = new URL(urlString);
+        URL url = new URL(null, urlString, new URLStreamHandler()
+                    {
+                        @Override
+                        protected URLConnection openConnection(URL u) throws IOException
+                        {
+                            throw new UnsupportedOperationException();
+                        }
+                    });
+        String protocol = url.getProtocol();
+        if(protocol == null || "".equals(protocol))
+        {
+            protocol = "amqp";
+        }
+        else if(!protocol.equals("amqp") && !protocol.equals("amqps"))
+        {
+            throw new MalformedURLException("Protocol '"+protocol+"' unknown. Must be one of 'amqp' or 'amqps'.");
+        }
         String host = url.getHost();
         int port = url.getPort();
         if(port == -1)
         {
-            port = 5672;
+            if("amqps".equals(protocol))
+            {
+                port = 5671;
+            }
+            else
+            {
+                port = 5672;
+            }
         }
         String userInfo = url.getUserInfo();
         String username = null;
@@ -112,10 +139,10 @@ public class ConnectionFactoryImpl implements ConnectionFactory, TopicConnection
         if(userInfo != null)
         {
             String[] components = userInfo.split(":",2);
-            username = components[0];
+            username = URLDecoder.decode(components[0]);
             if(components.length == 2)
             {
-                password = components[1];
+                password = URLDecoder.decode(components[1]);
             }
         }
         String query = url.getQuery();
@@ -170,4 +197,5 @@ public class ConnectionFactoryImpl implements ConnectionFactory, TopicConnection
         connection.setTopicConnection(true);
         return connection;
     }
+
 }
diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java b/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java
index e321245a0e..d14aeedf23 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java
+++ b/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java
@@ -766,7 +766,7 @@ public class SessionImpl implements Session, QueueSession, TopicSession
             {

                 while(!_closed)

                 {

-                    while(!_started || (_recoveredMessage == null && _messageConsumerList.isEmpty()))

+                    while(!_closed && (!_started || (_recoveredMessage == null && _messageConsumerList.isEmpty())))

                     {

                         try

                         {

@@ -777,7 +777,7 @@ public class SessionImpl implements Session, QueueSession, TopicSession
                             return;

                         }

                     }

-                    while(_started && (_recoveredMessage != null || !_messageConsumerList.isEmpty()))

+                    while(!_closed && (_started && (_recoveredMessage != null || !_messageConsumerList.isEmpty())))

                     {

                         Message msg;

 

diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/PropertiesFileInitialContextFactory.java b/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/PropertiesFileInitialContextFactory.java
index 31030a7d30..091ab41304 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/PropertiesFileInitialContextFactory.java
+++ b/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/PropertiesFileInitialContextFactory.java
@@ -57,6 +57,9 @@ public class PropertiesFileInitialContextFactory implements InitialContextFactor
         Map data = new ConcurrentHashMap();
 
         String file = null;
+        String fileName = (environment.containsKey(Context.PROVIDER_URL))
+                            ? (String)environment.get(Context.PROVIDER_URL) : System.getProperty(Context.PROVIDER_URL);
+
         try
         {