From c5211e63139dcd0ddfb2061b8ada312e6ea3083c Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Tue, 20 Feb 2007 09:16:59 +0000
Subject: 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
---
 .../org/apache/qpid/server/handler/BasicConsumeMethodHandler.java  | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'java/broker/src')

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)
                 {
-- 
cgit v1.2.1