QPID-1935: Reset QPID_WORK after modifying it. handy that.

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

1 files changed, 5 insertions, 11 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java b/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
index 3720281701..de0fdac2d0 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
@@ -33,6 +33,7 @@ public class FailoverBaseCase extends QpidTestCase
     protected int failingPort;
     
     private boolean failedOver = false;
+    private String _oldWork;
 
     public FailoverBaseCase()
     {
@@ -56,6 +57,7 @@ public class FailoverBaseCase extends QpidTestCase
         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 class FailoverBaseCase extends QpidTestCase
 
     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());
     }