1 files changed, 8 insertions, 2 deletions
diff --git a/java/client/src/old_test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java b/java/client/src/old_test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
index 44285efd96..1c86aea56c 100644
--- a/java/client/src/old_test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
+++ b/java/client/src/old_test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
@@ -63,11 +63,17 @@ public class JBossConnectionFactoryInitialiser implements ConnectionFactoryIniti
         }
         catch (NamingException e)
         {
-            throw new JMSException("Unable to lookup object: " + e);
+            JMSException jmse = new JMSException("Unable to lookup object: " + e);
+            jmse.setLinkedException(e);
+            jmse.initCause(e);
+            throw jmse;
         }
         catch (Exception e)
         {
-            throw new JMSException("Error creating topic: " + e);
+            JMSException jmse = new JMSException("Error creating topic: " + e);
+            jmse.setLinkedException(e);
+            jmse.initCause(e);
+            throw jmse;
         }
     }