QPID-2496

This allows a user to pass in an address string when creating a queue or topic using the JMS 1.0 methods (session.createQueue(String s) and session.createTopic(String s) )


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

3 files changed, 18 insertions, 2 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
index 78b01add14..5bd1bd629a 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
@@ -20,6 +20,8 @@
  */
 package org.apache.qpid.client;
 
+import java.net.URISyntaxException;
+
 import javax.jms.Queue;
 
 import org.apache.qpid.exchange.ExchangeDefaults;
@@ -29,6 +31,11 @@ import org.apache.qpid.url.BindingURL;
 public class AMQQueue extends AMQDestination implements Queue
 {
 
+    public AMQQueue(String address) throws URISyntaxException
+    {
+        super(address);
+    }
+    
     /**
      * Create a reference to a non temporary queue using a BindingURL object.
      * Note this does not actually imply the queue exists.
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index 175a4ffc77..8e04dc9cbb 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -1071,6 +1071,7 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
     public Queue createQueue(String queueName) throws JMSException
     {
         checkNotClosed();
+        
         if (queueName.indexOf('/') == -1)
         {
             return new AMQQueue(getDefaultQueueExchangeName(), new AMQShortString(queueName));
@@ -1079,7 +1080,7 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
         {
             try
             {
-                return new AMQQueue(new AMQBindingURL(queueName));
+                return new AMQQueue(queueName);
             }
             catch (URISyntaxException urlse)
             {
@@ -1090,6 +1091,7 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
                 throw jmse;
             }
         }
+
     }
 
     /**
@@ -1344,7 +1346,7 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
         {
             try
             {
-                return new AMQTopic(new AMQBindingURL(topicName));
+                return new AMQTopic(topicName);
             }
             catch (URISyntaxException urlse)
             {
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
index 40041afdc6..98509c1b99 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
@@ -20,6 +20,8 @@
  */
 package org.apache.qpid.client;
 
+import java.net.URISyntaxException;
+
 import javax.jms.JMSException;
 import javax.jms.Topic;
 
@@ -29,6 +31,11 @@ import org.apache.qpid.url.BindingURL;
 
 public class AMQTopic extends AMQDestination implements Topic
 {
+    public AMQTopic(String address) throws URISyntaxException
+    {
+        super(address);
+    }
+    
     /**
      * Constructor for use in creating a topic using a BindingURL.
      *