Author: robbie
Date: Sat Mar 30 15:20:37 2013
New Revision: 1462775
URL: http://svn.apache.org/r1462775
Log:
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.
merged from trunk r1461895
Modified:
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
Modified:
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java?rev=1462775&r1=1462774&r2=1462775&view=diff
==============================================================================
---
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
(original)
+++
qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
Sat Mar 30 15:20:37 2013
@@ -192,7 +192,7 @@ public class ServerSessionDelegate exten
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 exten
}
catch (AMQException e)
{
- exception(session, method, e, "Cannot subscribe to '"
+ destination);
+ exception(session, method, e, "Cannot subscribe to
queue '" + queueName + "' with destination '" + destination);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
