summaryrefslogtreecommitdiff
path: root/qpid/java/client/src
diff options
context:
space:
mode:
authorRafael H. Schloming <rhs@apache.org>2008-11-04 20:13:07 +0000
committerRafael H. Schloming <rhs@apache.org>2008-11-04 20:13:07 +0000
commitb6584aa4ff42b04827fe2c19e2879bd09efe8d58 (patch)
tree4c1b8b860ae13d3b5215db2d0dd289a4e83ba96d /qpid/java/client/src
parentd99388aabaa11e8ab448918fc672efb1b9d267a9 (diff)
downloadqpid-python-b6584aa4ff42b04827fe2c19e2879bd09efe8d58.tar.gz
QPID-1430: fixed an NPE on connection close
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@711377 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client/src')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
index 8a9abcc398..0539d2f234 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
@@ -206,7 +206,7 @@ public class AMQConnectionDelegate_0_10 implements AMQConnectionDelegate, Connec
ConnectionException exc = exception;
exception = null;
- ConnectionClose close = exc.getClose();
+ ConnectionClose close = (exc == null ? null : exc.getClose());
if (close == null)
{
try