diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2009-11-26 16:14:19 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2009-11-26 16:14:19 +0000 |
| commit | d37f3ad0906b4ff7742e2853204da4ef333eb1f9 (patch) | |
| tree | 9bd8e9e21e4fa0a710822cb31f8e866b49399f00 /qpid/java/broker | |
| parent | 24bae74ca6972d0b127e9e576de43c6be9cf138d (diff) | |
| download | qpid-python-d37f3ad0906b4ff7742e2853204da4ef333eb1f9.tar.gz | |
Fixes for 0-9-1 support
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@884619 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java | 6 | ||||
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java index d4272239d1..31401ce9d9 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java @@ -78,7 +78,7 @@ public class QueueUnbindHandler implements StateAwareMethodListener<QueueUnbindB if (queue == null) { - throw body.getConnectionException(AMQConstant.NOT_FOUND, "No default queue defined on channel and queue was null"); + throw body.getChannelException(AMQConstant.NOT_FOUND, "No default queue defined on channel and queue was null"); } routingKey = body.getRoutingKey() == null ? null : body.getRoutingKey().intern(); @@ -92,7 +92,7 @@ public class QueueUnbindHandler implements StateAwareMethodListener<QueueUnbindB if (queue == null) { - throw body.getConnectionException(AMQConstant.NOT_FOUND, "Queue " + body.getQueue() + " does not exist."); + throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " + body.getQueue() + " does not exist."); } final Exchange exch = exchangeRegistry.getExchange(body.getExchange()); if (exch == null) @@ -118,7 +118,7 @@ public class QueueUnbindHandler implements StateAwareMethodListener<QueueUnbindB { if(e.getErrorCode() == AMQConstant.NOT_FOUND) { - throw body.getConnectionException(AMQConstant.NOT_FOUND,e.getMessage(),e); + throw body.getChannelException(AMQConstant.NOT_FOUND,e.getMessage(),e); } throw body.getChannelException(AMQConstant.CHANNEL_ERROR, e.toString()); } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java index 04b3e75f8c..0824d12416 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java @@ -341,7 +341,7 @@ public class AMQProtocolEngine implements ProtocolEngine, Managable, AMQProtocol String locales = "en_US"; AMQMethodBody responseBody = getMethodRegistry().createConnectionStartBody((short) getProtocolMajorVersion(), - (short) getProtocolMinorVersion(), + (short) pv.getActualMinorVersion(), null, mechanisms.getBytes(), locales.getBytes()); |