summaryrefslogtreecommitdiff
path: root/qpid/java/common
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2008-06-20 09:37:20 +0000
committerRobert Godfrey <rgodfrey@apache.org>2008-06-20 09:37:20 +0000
commitcd633e9ec729c628f38ac4c3021f6223e68d81bb (patch)
tree2cbf9f8de96f2c9e492d2b45f722e60d8e057996 /qpid/java/common
parent6914ef1fd32597442c8a4dff89a3675c82932084 (diff)
downloadqpid-python-cd633e9ec729c628f38ac4c3021f6223e68d81bb.tar.gz
QPID-1144 : Reference count drops to zero too early for immediate messages in a txn
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@669841 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common')
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
index f6f596da95..ef9420ba87 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
@@ -54,6 +54,6 @@ public class AMQChannelException extends AMQException
public AMQFrame getCloseFrame(int channel)
{
MethodRegistry reg = MethodRegistry.getMethodRegistry(new ProtocolVersion(major,minor));
- return new AMQFrame(channel, reg.createChannelCloseBody(getErrorCode().getCode(), new AMQShortString(getMessage()),_classId,_methodId));
+ return new AMQFrame(channel, reg.createChannelCloseBody(getErrorCode() == null ? AMQConstant.INTERNAL_ERROR.getCode() : getErrorCode().getCode(), new AMQShortString(getMessage()),_classId,_methodId));
}
}