summaryrefslogtreecommitdiff
path: root/java/broker
diff options
context:
space:
mode:
authorAidan Skinner <aidan@apache.org>2009-06-22 14:41:10 +0000
committerAidan Skinner <aidan@apache.org>2009-06-22 14:41:10 +0000
commitd2be103aab95b0d82080f69dd66f8f5cea367852 (patch)
treea12d4e77ad980fc1b15975db02d9fe5cbd8a84fd /java/broker
parentc89f7d995b97b154e71c2ef1179f9ffd1b448dab (diff)
downloadqpid-python-d2be103aab95b0d82080f69dd66f8f5cea367852.tar.gz
QPID-1924: Make DerbyMessageStore honor $QPID_WORK.
DerbyMessageStore: pick up QPID_WORK FailoverBaseCase: set QPID_WORK for the second broker QpidTestCase: pass on QPID_WORK git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@787254 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker')
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java b/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
index 9695571371..18269fa5e8 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
@@ -155,7 +155,7 @@ public class DerbyMessageStore implements MessageStore
QueueRegistry queueRegistry = virtualHost.getQueueRegistry();
//Update to pick up QPID_WORK and use that as the default location not just derbyDB
- final String databasePath = config.getStoreConfiguration().getString(ENVIRONMENT_PATH_PROPERTY, "derbyDB");
+ final String databasePath = config.getStoreConfiguration().getString(ENVIRONMENT_PATH_PROPERTY, System.getProperty("QPID_WORK")+"/derbyDB");
File environmentPath = new File(databasePath);
if (!environmentPath.exists())