summaryrefslogtreecommitdiff
path: root/qpid/java/client
diff options
context:
space:
mode:
authorRafael H. Schloming <rhs@apache.org>2008-11-06 18:47:46 +0000
committerRafael H. Schloming <rhs@apache.org>2008-11-06 18:47:46 +0000
commit22bc5c3d65f45621a36c052ccb0d53aff5aa4c36 (patch)
treec25a61b7253deab5a2d7250e31163a8d8643b704 /qpid/java/client
parente8a9f9b9365c2f249c4edd58dde9e9e1347551a4 (diff)
downloadqpid-python-22bc5c3d65f45621a36c052ccb0d53aff5aa4c36.tar.gz
QPID-1430: *ahem* better fix for NPE on connection close
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@711939 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java7
1 files changed, 6 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 0539d2f234..30ea4dcf8d 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,12 @@ public class AMQConnectionDelegate_0_10 implements AMQConnectionDelegate, Connec
ConnectionException exc = exception;
exception = null;
- ConnectionClose close = (exc == null ? null : exc.getClose());
+ if (exc == null)
+ {
+ return;
+ }
+
+ ConnectionClose close = exc.getClose();
if (close == null)
{
try