From 51814d927bb54b52bf19dc6745a333cebf0757ee Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Sun, 25 Sep 2011 23:26:50 +0000
Subject: QPID-3444: issue an invalid argument execution exception if the
 exchange name is null or the empty string. Update some constants to ensure
 the error code is logged with the correct message

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1175625 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java  | 2 +-
 .../unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'qpid/java/client')

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
index 2cf19bf391..b9d4d6fa95 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
@@ -78,7 +78,7 @@ public class ChannelCloseMethodHandler implements StateAwareMethodListener<Chann
                 {
                     throw new AMQNoRouteException("Error: " + reason, null, null);
                 }
-                else if (errorCode == AMQConstant.INVALID_ARGUMENT)
+                else if (errorCode == AMQConstant.ARGUMENT_INVALID)
                 {
                     _logger.debug("Broker responded with Invalid Argument.");
 
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
index 66f220643c..d560c413e6 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
@@ -73,7 +73,7 @@ public class ChannelCloseMethodHandlerNoCloseOk implements StateAwareMethodListe
             {
                 throw new AMQNoRouteException("Error: " + reason, null, null);
             }
-            else if (errorCode == AMQConstant.INVALID_ARGUMENT)
+            else if (errorCode == AMQConstant.ARGUMENT_INVALID)
             {
                 _logger.debug("Broker responded with Invalid Argument.");
 
-- 
cgit v1.2.1