diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-04-25 00:01:33 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-04-25 00:01:33 +0000 |
| commit | 4eddea8954ba9342ab2bc35e495baa673a6015db (patch) | |
| tree | 32c82a8c8529db6c3f01b5123abce4e35b961c04 /qpid/java/broker-plugins/amqp-0-10-protocol | |
| parent | 6c082f6883922e98e627394c3fa951680a7729b2 (diff) | |
| download | qpid-python-4eddea8954ba9342ab2bc35e495baa673a6015db.tar.gz | |
QPID-5578 : Ensure correct error code is returned when a queue is declared with an unknown alternate exchange
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589912 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/amqp-0-10-protocol')
| -rw-r--r-- | qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java index 200519a285..ff57e6a33c 100644 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java @@ -48,6 +48,7 @@ import org.apache.qpid.server.message.MessageSource; import org.apache.qpid.server.model.ExclusivityPolicy; import org.apache.qpid.server.model.LifetimePolicy; import org.apache.qpid.server.model.Queue; +import org.apache.qpid.server.model.UnknownConfiguredObjectException; import org.apache.qpid.server.plugin.ExchangeType; import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.QueueArgumentsConverter; @@ -72,7 +73,6 @@ import org.apache.qpid.server.virtualhost.ExchangeIsAlternateException; import org.apache.qpid.server.virtualhost.QueueExistsException; import org.apache.qpid.server.virtualhost.RequiredExchangeException; import org.apache.qpid.server.virtualhost.ReservedExchangeNameException; -import org.apache.qpid.server.virtualhost.UnknownExchangeException; import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.transport.*; @@ -750,10 +750,10 @@ public class ServerSessionDelegate extends SessionDelegate exception(session, method, ExecutionErrorCode.NOT_ALLOWED, "Attempt to declare exchange: " + exchangeName + " which begins with reserved name or prefix."); } - catch(UnknownExchangeException e) + catch(UnknownConfiguredObjectException e) { exception(session, method, ExecutionErrorCode.NOT_FOUND, - "Unknown alternate exchange " + e.getExchangeName()); + "Unknown alternate exchange " + e.getName()); } catch(AMQUnknownExchangeType e) { |