QPID-341 When using Queues and Topics defined via JNDI settings are not preserved.

Removed extraction of destination/queue name and used BindingURL directly to create Destination.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
index b2d2d2bec3..17af3702a4 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
@@ -62,7 +62,7 @@ public class AMQConnectionFactory implements ConnectionFactory, QueueConnectionF
                                 String clientName, String virtualHost) throws URLSyntaxException
     {
         this(new AMQConnectionURL(ConnectionURL.AMQ_PROTOCOL + "://" +
-                                  username + ":" + password + "@" + clientName +
+                                  username + ":" + password + "@" + clientName + "/" +
                                   virtualHost + "?brokerlist='" + broker + "'"));
     }
 
@@ -334,7 +334,7 @@ public class AMQConnectionFactory implements ConnectionFactory, QueueConnectionF
 
                 if (addr != null)
                 {
-                    return new AMQQueue(new AMQBindingURL((String) addr.getContent()).getQueueName());
+                    return new AMQQueue(new AMQBindingURL((String) addr.getContent()));
                 }
             }
 
@@ -344,7 +344,7 @@ public class AMQConnectionFactory implements ConnectionFactory, QueueConnectionF
 
                 if (addr != null)
                 {
-                    return new AMQTopic(new AMQBindingURL((String) addr.getContent()).getDestinationName());
+                    return new AMQTopic(new AMQBindingURL((String) addr.getContent()));
                 }
             }