Author: rhs
Date: Thu Nov 6 10:47:46 2008
New Revision: 711939
URL: http://svn.apache.org/viewvc?rev=711939&view=rev
Log:
QPID-1430: *ahem* better fix for NPE on connection close
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java?rev=711939&r1=711938&r2=711939&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
Thu Nov 6 10:47:46 2008
@@ -206,7 +206,12 @@
ConnectionException exc = exception;
exception = null;
- ConnectionClose close = (exc == null ? null : exc.getClose());
+ if (exc == null)
+ {
+ return;
+ }
+
+ ConnectionClose close = exc.getClose();
if (close == null)
{
try
