1 files changed, 20 insertions, 9 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java b/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
index 7d84ec6470..319e728edf 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
@@ -39,32 +39,43 @@ public class AMQTopic extends AMQDestination implements Topic
         super(binding);
     }
 
-    public AMQTopic(String name)
-    {
-        this(new AMQShortString(name));
-    }
+//    public AMQTopic(String exchangeName, String routingKey)
+//    {
+//        this(new AMQShortString(exchangeName), new AMQShortString(routingKey));
+//    }
 
     public AMQTopic(AMQShortString exchange, AMQShortString routingKey, AMQShortString queueName)
     {
         super(exchange, ExchangeDefaults.TOPIC_EXCHANGE_CLASS, routingKey, true, true, queueName, false);
     }
 
+    public AMQTopic(AMQConnection conn, String routingKey)
+    {
+        this(conn.getDefaultTopicExchangeName(), new AMQShortString(routingKey));
+    }
+
+
+    public AMQTopic(AMQShortString exchangeName, String routingKey)
+    {
+        this(exchangeName, new AMQShortString(routingKey));
+    }
 
-    public AMQTopic(AMQShortString name)
+    public AMQTopic(AMQShortString exchangeName, AMQShortString routingKey)
     {
-        this(name, true, null, false);
+        this(exchangeName, routingKey, null);
     }
 
-    public AMQTopic(AMQShortString name, boolean isAutoDelete, AMQShortString queueName, boolean isDurable)
+    public AMQTopic(AMQShortString exchangeName, AMQShortString name, boolean isAutoDelete, AMQShortString queueName, boolean isDurable)
     {
-        super(ExchangeDefaults.TOPIC_EXCHANGE_NAME, ExchangeDefaults.TOPIC_EXCHANGE_CLASS, name, true, isAutoDelete,
+        super(exchangeName, ExchangeDefaults.TOPIC_EXCHANGE_CLASS, name, true, isAutoDelete,
               queueName, isDurable);
     }
 
     public static AMQTopic createDurableTopic(AMQTopic topic, String subscriptionName, AMQConnection connection)
             throws JMSException
     {
-        return new AMQTopic(topic.getDestinationName(), false, getDurableTopicQueueName(subscriptionName, connection),
+        return new AMQTopic(topic.getExchangeName(), topic.getDestinationName(), false,
+                            getDurableTopicQueueName(subscriptionName, connection),
                             true);
     }