QPID-4666: fix exception messages during during 0-10 MessageSubscribe failures: include the queue name in exception message sent following ACL refusal, and fix typo in exception sent when an subscription already exists with the given destination.

Based on patch by JAkub Scholz with some updates of my own.


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

1 files changed, 2 insertions, 2 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
index d83bd1c4dc..7a6c0c42be 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
@@ -192,7 +192,7 @@ public class ServerSessionDelegate extends SessionDelegate
 
             if(((ServerSession)session).getSubscription(destination)!=null)
             {
-                exception(session, method, ExecutionErrorCode.NOT_ALLOWED, "Subscription already exists with destaination: '"+destination+"'");
+                exception(session, method, ExecutionErrorCode.NOT_ALLOWED, "Subscription already exists with destination '"+destination+"'");
             }
             else
             {
@@ -275,7 +275,7 @@ public class ServerSessionDelegate extends SessionDelegate
                     }
                     catch (AMQException e)
                     {
-                        exception(session, method, e, "Cannot subscribe to '" + destination);
+                        exception(session, method, e, "Cannot subscribe to queue '" + queueName + "' with destination '" + destination);
                     }
                 }
             }