1 files changed, 11 insertions, 2 deletions
diff --git a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
index 1e2169d3a2..50ca39c83b 100644
--- a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
+++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
@@ -462,15 +462,24 @@ public class MultiNodeTest extends QpidBrokerTestCase
         envConfig.setDurability(new Durability(Durability.SyncPolicy.SYNC, Durability.SyncPolicy.WRITE_NO_SYNC, Durability.ReplicaAckPolicy.SIMPLE_MAJORITY));
 
         ReplicatedEnvironment intruder = null;
+        final String currentThreadName = Thread.currentThread().getName();
         try
         {
+
             intruder = new ReplicatedEnvironment(environmentPathFile, replicationConfig, envConfig);
         }
         finally
         {
-            if (intruder != null)
+            try
+            {
+                if (intruder != null)
+                {
+                    intruder.close();
+                }
+            }
+            finally
             {
-                intruder.close();
+                Thread.currentThread().setName(currentThreadName);
             }
         }