QPID-3142: remove incorrectly added wrapping check on alternative cleanup option

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

1 files changed, 5 insertions, 8 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index d7da5d8a78..6fcde7e185 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -285,17 +285,14 @@ public class QpidBrokerTestCase extends QpidTestCase
             fail("Unable to test without config file:" + _configFile);
         }
 
-        if(_brokerCleanBetweenTests)
+        String existingQpidWorkPath = System.getProperty(BROKER_EXISTING_QPID_WORK);
+        if(existingQpidWorkPath != null && !existingQpidWorkPath.equals(""))
         {
             cleanBroker();
 
-            String existingQpidWorkPath = System.getProperty(BROKER_EXISTING_QPID_WORK);
-            if(existingQpidWorkPath != null && !existingQpidWorkPath.equals(""))
-            {
-                File existing = new File(existingQpidWorkPath);
-                File qpidWork = new File(getQpidWork(_broker, getPort()));
-                FileUtils.copyRecursive(existing, qpidWork);
-            }
+            File existing = new File(existingQpidWorkPath);
+            File qpidWork = new File(getQpidWork(_broker, getPort()));
+            FileUtils.copyRecursive(existing, qpidWork);
         }
 
         startBroker();