Author: ritchiem
Date: Tue Feb 20 01:16:59 2007
New Revision: 509478
URL: http://svn.apache.org/viewvc?view=rev&rev=509478
Log:
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).
Added:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
(with props)
Removed:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidSelectorException.java
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java?view=diff&rev=509478&r1=509477&r2=509478
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
Tue Feb 20 01:16:59 2007
@@ -22,12 +22,9 @@
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 @@
//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)
{
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?view=diff&rev=509478&r1=509477&r2=509478
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
Tue Feb 20 01:16:59 2007
@@ -56,9 +56,9 @@
import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQInvalidSelectorException;
import org.apache.qpid.AMQUndeliveredException;
import org.apache.qpid.AMQInvalidRoutingKeyException;
+import org.apache.qpid.AMQInvalidArgumentException;
import org.apache.qpid.client.failover.FailoverSupport;
import org.apache.qpid.client.message.AbstractJMSMessage;
import org.apache.qpid.client.message.JMSBytesMessage;
@@ -521,7 +521,7 @@
0,
// methodId
AMQConstant.REPLY_SUCCESS.getCode(), // replyCode
new
AMQShortString("JMS client closing channel")); // replyText
-
+
getProtocolHandler().syncWrite(frame,
ChannelCloseOkBody.class, timeout);
// When control resumes at this point, a reply will have
been received that
// indicates the broker has closed the channel successfully
@@ -1049,7 +1049,7 @@
{
registerConsumer(consumer, false);
}
- catch (AMQInvalidSelectorException ise)
+ catch (AMQInvalidArgumentException ise)
{
JMSException ex = new
InvalidSelectorException(ise.getMessage());
ex.setLinkedException(ise);
@@ -1057,7 +1057,9 @@
}
catch (AMQInvalidRoutingKeyException e)
{
- throw new
InvalidDestinationException(amqd.getRoutingKey().toString());
+ JMSException ide = new
InvalidDestinationException("Invalid routing
key:"+amqd.getRoutingKey().toString());
+ ide.setLinkedException(e);
+ throw ide;
}
catch (AMQException e)
{
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java?view=diff&rev=509478&r1=509477&r2=509478
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
Tue Feb 20 01:16:59 2007
@@ -23,7 +23,6 @@
import org.apache.log4j.Logger;
import org.apache.qpid.AMQChannelClosedException;
import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQInvalidSelectorException;
import org.apache.qpid.AMQInvalidRoutingKeyException;
import org.apache.qpid.client.AMQNoConsumersException;
import org.apache.qpid.client.AMQNoRouteException;
@@ -74,11 +73,11 @@
{
throw new AMQNoRouteException("Error: " + reason, null);
}
- else if (errorCode == AMQConstant.INVALID_SELECTOR)
+ else if (errorCode == AMQConstant.INVALID_ARGUMENT)
{
- _logger.debug("Broker responded with Invalid Selector.");
+ _logger.debug("Broker responded with Invalid Argument.");
- throw new AMQInvalidSelectorException(String.valueOf(reason));
+ throw new
org.apache.qpid.AMQInvalidArgumentException(String.valueOf(reason));
}
else if (errorCode == AMQConstant.INVALID_ROUTING_KEY)
{
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java?view=diff&rev=509478&r1=509477&r2=509478
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
Tue Feb 20 01:16:59 2007
@@ -29,9 +29,9 @@
import org.apache.qpid.protocol.AMQMethodEvent;
import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQInvalidSelectorException;
import org.apache.qpid.AMQInvalidRoutingKeyException;
import org.apache.qpid.AMQChannelClosedException;
+import org.apache.qpid.AMQInvalidArgumentException;
import org.apache.qpid.framing.ChannelCloseBody;
import org.apache.qpid.framing.AMQShortString;
@@ -73,11 +73,11 @@
{
throw new AMQNoRouteException("Error: " + reason, null);
}
- else if (errorCode == AMQConstant.INVALID_SELECTOR)
+ else if (errorCode == AMQConstant.INVALID_ARGUMENT)
{
- _logger.debug("Broker responded with Invalid Selector.");
+ _logger.debug("Broker responded with Invalid Argument.");
- throw new AMQInvalidSelectorException(String.valueOf(reason));
+ throw new AMQInvalidArgumentException(String.valueOf(reason));
}
else if (errorCode == AMQConstant.INVALID_ROUTING_KEY)
{
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java?view=diff&rev=509478&r1=509477&r2=509478
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java
Tue Feb 20 01:16:59 2007
@@ -23,9 +23,7 @@
import org.apache.log4j.Logger;
import org.apache.qpid.protocol.AMQConstant;
-/**
- * Generic AMQ exception.
- */
+/** Generic AMQ exception. */
public class AMQException extends Exception
{
private AMQConstant _errorCode;
@@ -78,5 +76,5 @@
{
return _errorCode;
}
-
+
}
Added:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java?view=auto&rev=509478
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
(added)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
Tue Feb 20 01:16:59 2007
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *
+ */
+package org.apache.qpid;
+
+import org.apache.qpid.protocol.AMQConstant;
+
+public class AMQInvalidArgumentException extends AMQException
+{
+ public AMQInvalidArgumentException(String message)
+ {
+ super(AMQConstant.INVALID_ARGUMENT, message);
+ }
+}
Propchange:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java?view=diff&rev=509478&r1=509477&r2=509478
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
Tue Feb 20 01:16:59 2007
@@ -26,6 +26,6 @@
{
public AMQInvalidRoutingKeyException(String message)
{
- super(AMQConstant.INVALID_ROUTING_KEY,message);
+ super(AMQConstant.INVALID_ROUTING_KEY, message);
}
}
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java?view=diff&rev=509478&r1=509477&r2=509478
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
Tue Feb 20 01:16:59 2007
@@ -74,12 +74,6 @@
public static final AMQConstant CONTEXT_IN_USE = new AMQConstant(320,
"context in use", true);
- public static final AMQConstant CONTEXT_UNKNOWN = new AMQConstant(321,
"context unknown", true);
-
- public static final AMQConstant INVALID_SELECTOR = new AMQConstant(322,
"selector invalid", true);
-
- public static final AMQConstant INVALID_ROUTING_KEY = new AMQConstant(323,
"routing key invalid", true);
-
public static final AMQConstant INVALID_PATH = new AMQConstant(402,
"invalid path", true);
public static final AMQConstant ACCESS_REFUSED = new AMQConstant(403,
"access refused", true);
@@ -90,7 +84,11 @@
public static final AMQConstant IN_USE = new AMQConstant(406, "In use",
true);
+ public static final AMQConstant INVALID_ROUTING_KEY = new AMQConstant(407,
"routing key invalid", true);
+
public static final AMQConstant REQUEST_TIMEOUT = new AMQConstant(408,
"Request Timeout", true);
+
+ public static final AMQConstant INVALID_ARGUMENT = new AMQConstant(409,
"argument invalid", true);
public static final AMQConstant FRAME_ERROR = new AMQConstant(501, "frame
error", true);
