Author: aidan
Date: Tue Jun 23 15:16:39 2009
New Revision: 787701
URL: http://svn.apache.org/viewvc?rev=787701&view=rev
Log:
QPID-1935: Reset QPID_WORK after modifying it. handy that.
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java?rev=787701&r1=787700&r2=787701&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
Tue Jun 23 15:16:39 2009
@@ -33,6 +33,7 @@
protected int failingPort;
private boolean failedOver = false;
+ private String _oldWork;
public FailoverBaseCase()
{
@@ -56,6 +57,7 @@
super.setUp();
cleanBroker();
FileUtils.deleteDirectory(System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
+ _oldWork = System.getProperty("QPID_WORK");
System.setProperty("QPID_WORK",
System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
startBroker(getFailingPort());
}
@@ -76,18 +78,10 @@
public void tearDown() throws Exception
{
- int port;
- if (_broker.equals(VM))
- {
- port = FAILING_VM_PORT;
- }
- else
- {
- port = FAILING_PORT;
- }
- stopBroker(port);
-
FileUtils.deleteDirectory(System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
+ stopBroker(getFailingPort());
+ System.setProperty("QPID_WORK", _oldWork);
super.tearDown();
+
FileUtils.deleteDirectory(System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
