summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2012-02-13 21:59:54 +0000
committerRobert Gemmell <robbie@apache.org>2012-02-13 21:59:54 +0000
commit33ea2e1097a4008e4e72ce4a628c3266aa6d0e0e (patch)
tree476d0095f1ada8915227b06f73a29b74fc26778b /qpid/java
parent8790864ca1b1ccb2c2302a801b5c66e866c75f8d (diff)
downloadqpid-python-33ea2e1097a4008e4e72ce4a628c3266aa6d0e0e.tar.gz
QPID-3837: align the 0-10 exception message for an exchange redeclare attempt with the equivalent 0-9-1 message for clarity and consistency
I should test this first, but it is just a string so...<rolls dice> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1243709 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java4
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 7e6caf7979..b61a562f39 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
@@ -465,7 +465,7 @@ public class ServerSessionDelegate extends SessionDelegate
{
if(!exchange.getTypeShortString().toString().equals(method.getType()))
{
- exception(session, method, ExecutionErrorCode.NOT_ALLOWED, "Cannot redeclare with a different exchange type");
+ exception(session, method, ExecutionErrorCode.NOT_ALLOWED, "Attempt to redeclare exchange: " + exchangeName + " of type " + exchange.getType() + " to " + method.getType() +".");
}
}
@@ -515,7 +515,7 @@ public class ServerSessionDelegate extends SessionDelegate
{
if(!exchange.getTypeShortString().toString().equals(method.getType()))
{
- exception(session, method, ExecutionErrorCode.NOT_ALLOWED, "Cannot redeclare with a different exchange type");
+ exception(session, method, ExecutionErrorCode.NOT_ALLOWED, "Attempt to redeclare exchange: " + exchangeName + " of type " + exchange.getType() + " to " + method.getType() +".");
}
}