From e057c29dd31369739c7dfad730ccc1e84d89a287 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Mon, 18 Apr 2011 10:05:43 +0000 Subject: 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 --- .../java/org/apache/qpid/test/utils/QpidBrokerTestCase.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'qpid/java/systests') 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(); -- cgit v1.2.1