You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2015/04/14 23:42:39 UTC

activemq git commit: https://issues.apache.org/jira/browse/AMQ-5719

Repository: activemq
Updated Branches:
  refs/heads/master a5a52b651 -> be6617507


https://issues.apache.org/jira/browse/AMQ-5719

This closes #86

commit 72837960cffc58b559ced6c243a459c62cb153cf
Author: Christopher L. Shannon (cshannon)
<ch...@gmail.com>

Updated durable related error messages in TopicRegion to include both
subscriptionName and clientId.

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/be661750
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/be661750
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/be661750

Branch: refs/heads/master
Commit: be6617507914532188530a605e476cb8ae59cdce
Parents: a5a52b6
Author: Timothy Bish <ta...@gmail.com>
Authored: Tue Apr 14 17:42:30 2015 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue Apr 14 17:42:30 2015 -0400

----------------------------------------------------------------------
 .../java/org/apache/activemq/broker/region/TopicRegion.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/be661750/activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicRegion.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicRegion.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicRegion.java
index d0e15cd..a146aba 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicRegion.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicRegion.java
@@ -200,7 +200,9 @@ public class TopicRegion extends AbstractRegion {
         SubscriptionKey key = new SubscriptionKey(info.getClientId(), info.getSubscriptionName());
         DurableTopicSubscription sub = durableSubscriptions.get(key);
         if (sub == null) {
-            throw new InvalidDestinationException("No durable subscription exists for: " + info.getSubscriptionName());
+            throw new InvalidDestinationException("No durable subscription exists for clientID: " +
+                                                  info.getClientId() + " and subscriptionName: " +
+                                                  info.getSubscriptionName());
         }
         if (sub.isActive()) {
             throw new JMSException("Durable consumer is in use");
@@ -336,7 +338,9 @@ public class TopicRegion extends AbstractRegion {
                 }
                 durableSubscriptions.put(key, sub);
             } else {
-                throw new JMSException("That durable subscription is already active.");
+                throw new JMSException("Durable subscription is already active for clientID: " +
+                                       context.getClientId() + " and subscriptionName: " +
+                                       info.getSubscriptionName());
             }
             return sub;
         }