summaryrefslogtreecommitdiff
path: root/qpid/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
commit1ab5653475db88228b6e86013e68a176c1e8008a (patch)
treefcc47f192b32916ccd25233843e4d6a7d76dd64e /qpid/java/broker
parent213a473f561d616d0dacc19425a8620f2d1022cc (diff)
downloadqpid-python-1ab5653475db88228b6e86013e68a176c1e8008a.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@787254 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
index 9695571371..18269fa5e8 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
+++ b/qpid/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())