Author: robbie
Date: Mon Feb 13 21:59:54 2012
New Revision: 1243709
URL: http://svn.apache.org/viewvc?rev=1243709&view=rev
Log:
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>
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java?rev=1243709&r1=1243708&r2=1243709&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
Mon Feb 13 21:59:54 2012
@@ -465,7 +465,7 @@ public class ServerSessionDelegate exten
{
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 exten
{
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() +".");
}
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
