summaryrefslogtreecommitdiff
path: root/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
commitee4d8230649fa7ebb5a8688b7a5fdc7da519f1f7 (patch)
tree0d2a59f43d74e31815225fd67ff45a247f458734 /java/client
parentd1120dc4f0c20cd4ad0ee576e19f316fe19d3c71 (diff)
downloadqpid-python-ee4d8230649fa7ebb5a8688b7a5fdc7da519f1f7.tar.gz
QPID-1430: *ahem* better fix for NPE on connection close
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@711939 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/client')
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
index 0539d2f234..30ea4dcf8d 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
+++ b/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