From 0a21083d98f326d476a765e71f9b14047bb87bc2 Mon Sep 17 00:00:00 2001
From: Bhupendra Bhusman Bhardwaj <bhupendrab@apache.org>
Date: Thu, 15 Feb 2007 14:25:49 +0000
Subject: If there is any error in closing the connection, then also the thread
 setup should be removed

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@507938 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/test/java/org/apache/qpid/ping/PingTestPerf.java          | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/java/perftests/src/test/java/org/apache/qpid/ping/PingTestPerf.java b/java/perftests/src/test/java/org/apache/qpid/ping/PingTestPerf.java
index 9650a78fda..2057f09bc7 100644
--- a/java/perftests/src/test/java/org/apache/qpid/ping/PingTestPerf.java
+++ b/java/perftests/src/test/java/org/apache/qpid/ping/PingTestPerf.java
@@ -237,14 +237,16 @@ public class PingTestPerf extends AsymptoticTestCase implements TestThreadAware
                     perThreadSetup._pingClient.close();
                 }
             }
-
-            // Ensure the per thread fixture is reclaimed.
-            threadSetup.remove();
         }
         catch (JMSException e)
         {
             _logger.warn("There was an exception during per thread tear down.");
         }
+        finally
+        {
+            // Ensure the per thread fixture is reclaimed.
+            threadSetup.remove();
+        }
     }
 
     protected static class PerThreadSetup
-- 
cgit v1.2.1