summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--java/client/test/src/org/apache/qpid/ack/DisconnectAndRedeliverTest.java9
-rw-r--r--java/client/test/src/org/apache/qpid/ack/RecoverTest.java9
2 files changed, 16 insertions, 2 deletions
diff --git a/java/client/test/src/org/apache/qpid/ack/DisconnectAndRedeliverTest.java b/java/client/test/src/org/apache/qpid/ack/DisconnectAndRedeliverTest.java
index 68460682ec..6034247e48 100644
--- a/java/client/test/src/org/apache/qpid/ack/DisconnectAndRedeliverTest.java
+++ b/java/client/test/src/org/apache/qpid/ack/DisconnectAndRedeliverTest.java
@@ -40,8 +40,15 @@ public class DisconnectAndRedeliverTest
static
{
+ String workdir = System.getProperty("QPID_WORK");
+ if (workdir == null || workdir.equals(""))
+ {
+ String tempdir = System.getProperty("java.io.tmpdir");
+ System.out.println("QPID_WORK not set using tmp directory: " + tempdir);
+ System.setProperty("QPID_WORK", tempdir);
+ }
//DOMConfigurator.configure("../etc/log4j.xml");
- DOMConfigurator.configure("broker/etc/log4j.xml");
+ DOMConfigurator.configure("broker/etc/log4j.xml");
}
@Before
diff --git a/java/client/test/src/org/apache/qpid/ack/RecoverTest.java b/java/client/test/src/org/apache/qpid/ack/RecoverTest.java
index 0feecb5a79..e12ca45de3 100644
--- a/java/client/test/src/org/apache/qpid/ack/RecoverTest.java
+++ b/java/client/test/src/org/apache/qpid/ack/RecoverTest.java
@@ -38,6 +38,13 @@ public class RecoverTest
static
{
+ String workdir = System.getProperty("QPID_WORK");
+ if (workdir == null || workdir.equals(""))
+ {
+ String tempdir = System.getProperty("java.io.tmpdir");
+ System.out.println("QPID_WORK not set using tmp directory: " + tempdir);
+ System.setProperty("QPID_WORK", tempdir);
+ }
//DOMConfigurator.configure("../etc/log4j.xml");
DOMConfigurator.configure("broker/etc/log4j.xml");
}
@@ -45,7 +52,7 @@ public class RecoverTest
@After
public void stopVmBroker()
{
- TransportConnection.killVMBroker(1);
+ TransportConnection.killVMBroker(1);
}
@Test