1 files changed, 5 insertions, 0 deletions
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 f85b1e655d..25562cfff7 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
@@ -1058,6 +1058,11 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
             try
             {
                 handleAddressBasedDestination(dest,false,true);
+                if (dest.getAddressType() !=  AMQDestination.TOPIC_TYPE)
+                {
+                    throw new JMSException("Durable subscribers can only be created for Topics");
+                }
+                dest.getSourceNode().setDurable(true);
             }
             catch(AMQException e)
             {