1 files changed, 7 insertions, 4 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java
index f631a9a4ba..074c2fa566 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java
@@ -243,11 +243,14 @@ public class TransactionTimeoutTestCase extends QpidBrokerTestCase implements Ex
     /** @see javax.jms.ExceptionListener#onException(javax.jms.JMSException) */
     public void onException(JMSException jmse)
     {
-        _caught.countDown();
-        _message = jmse.getLinkedException().getMessage();
-        if (jmse.getLinkedException() instanceof AMQException)
+        if (_caught.getCount() > 0L)
         {
-            _code = ((AMQException) jmse.getLinkedException()).getErrorCode();
+            _caught.countDown();
+            _message = jmse.getLinkedException().getMessage();
+            if (jmse.getLinkedException() instanceof AMQException)
+            {
+                _code = ((AMQException) jmse.getLinkedException()).getErrorCode();
+            }
         }
     }
 }