diff options
| author | Robert Gemmell <robbie@apache.org> | 2011-09-25 23:26:50 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2011-09-25 23:26:50 +0000 |
| commit | 12a7ad9d818f2793ad8708f2ee3d64b5e8d4b3a7 (patch) | |
| tree | 7b57e66e0187bd90dbca84c4e13226dc4d902392 /java/common/src/main | |
| parent | 5a9efa793cab32e8341387c2d9b509502aea3612 (diff) | |
| download | qpid-python-12a7ad9d818f2793ad8708f2ee3d64b5e8d4b3a7.tar.gz | |
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/qpid@1175625 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/common/src/main')
| -rw-r--r-- | java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java | 2 | ||||
| -rw-r--r-- | java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java b/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java index baca2a4773..2bbaaef1fc 100644 --- a/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java +++ b/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java @@ -34,7 +34,7 @@ public class AMQInvalidArgumentException extends AMQException { public AMQInvalidArgumentException(String message, Throwable cause) { - super(AMQConstant.INVALID_ARGUMENT, message, cause); + super(AMQConstant.ARGUMENT_INVALID, message, cause); } public boolean isHardError() diff --git a/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java b/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java index f9f6ca8444..14d1befaf1 100644 --- a/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java +++ b/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java @@ -104,7 +104,7 @@ public final class AMQConstant 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 ARGUMENT_INVALID = new AMQConstant(409, "argument invalid", true); /** * The client sent a malformed frame that the server could not decode. This strongly implies a programming error @@ -153,10 +153,7 @@ public final class AMQConstant public static final AMQConstant FRAME_MIN_SIZE = new AMQConstant(4096, "frame min size", true); - /** - * The server does not support the protocol version - */ - public static final AMQConstant UNSUPPORTED_BROKER_PROTOCOL_ERROR = new AMQConstant(542, "broker unsupported protocol", true); + public static final AMQConstant INVALID_ARGUMENT = new AMQConstant(542, "invalid argument", true); /** * The client imp does not support the protocol version */ |