added test for exception listener; fixed NPE

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@619538 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 4 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 e7a2a62e19..bf1ed49492 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
@@ -148,11 +148,15 @@ public class AMQConnectionDelegate_0_10 implements AMQConnectionDelegate, Closed
         {
             _logger.debug("Received a connection close from the broker: Error code : " + errorCode.getCode());
         }
-        JMSException ex = new JMSException(reason,String.valueOf(errorCode.getCode()));
-        if (t != null)
+        if (_conn._exceptionListener != null)
         {
-            ex.initCause(t);
+            JMSException ex = new JMSException(reason,String.valueOf(errorCode.getCode()));
+            if (t != null)
+            {
+                ex.initCause(t);
+            }
+
+            _conn._exceptionListener.onException(ex);
         }
-        _conn._exceptionListener.onException(ex);
     }
 }