diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-02-20 09:16:59 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-02-20 09:16:59 +0000 |
| commit | c5211e63139dcd0ddfb2061b8ada312e6ea3083c (patch) | |
| tree | 53b336e3ed265db410689baf02c591a0d1017e25 /java/broker/src | |
| parent | 625170d9a3f64970987161c59a60497065c4bef6 (diff) | |
| download | qpid-python-c5211e63139dcd0ddfb2061b8ada312e6ea3083c.tar.gz | |
Renamed AMQInvalidSelectorException to be AMQInvalidArgumentException to better fit the generic use of the argument table in the AMQP Queue.Bind spec. Adjusted AMQConstant to match the proposal for additional codes AMQP-39,40,41 (https://wiki.108.redhat.com/jira/browse/AMQP-39).
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@509478 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/src')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java index 090988d304..da61f2ffd5 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java +++ b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java @@ -22,12 +22,9 @@ package org.apache.qpid.server.handler; import org.apache.log4j.Logger; import org.apache.qpid.AMQException; -import org.apache.qpid.AMQInvalidSelectorException; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.BasicConsumeBody; import org.apache.qpid.framing.BasicConsumeOkBody; -import org.apache.qpid.framing.ChannelCloseBody; -import org.apache.qpid.framing.ConnectionCloseBody; import org.apache.qpid.protocol.AMQConstant; import org.apache.qpid.protocol.AMQMethodEvent; import org.apache.qpid.server.AMQChannel; @@ -106,10 +103,10 @@ public class BasicConsumeMethodHandler implements StateAwareMethodListener<Basic //now allow queue to start async processing of any backlog of messages queue.deliverAsync(); } - catch (AMQInvalidSelectorException ise) + catch (org.apache.qpid.AMQInvalidArgumentException ise) { _log.info("Closing connection due to invalid selector"); - throw body.getChannelException(AMQConstant.INVALID_SELECTOR, ise.getMessage()); + throw body.getChannelException(AMQConstant.INVALID_ARGUMENT, ise.getMessage()); } catch (ConsumerTagNotUniqueException e) { |