You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2011/04/18 12:05:43 UTC
svn commit: r1094445 -
/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
Author: robbie
Date: Mon Apr 18 10:05:43 2011
New Revision: 1094445
URL: http://svn.apache.org/viewvc?rev=1094445&view=rev
Log:
QPID-3142: remove incorrectly added wrapping check on alternative cleanup option
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1094445&r1=1094444&r2=1094445&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Mon Apr 18 10:05:43 2011
@@ -285,17 +285,14 @@ public class QpidBrokerTestCase extends
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();
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org