[rhmessaging-commits] rhmessaging commits: r3764 - store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb.

[rhmessaging-commits at lists.jboss.org]

Author: rgemmell
Date: 2010-01-06 15:37:41 -0500 (Wed, 06 Jan 2010)
New Revision: 3764

Modified:
   store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
Log:
Add the virtualhost name to the default environment to prevent overlap when failing to specify a location. Also make default location adhere to QPID_WORK

Modified: store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
===================================================================
--- store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java	2010-01-06 20:33:27 UTC (rev 3763)
+++ store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java	2010-01-06 20:37:41 UTC (rev 3764)
@@ -192,7 +192,7 @@
         super.configure(virtualHost, base, vHostConfig);
 
         Configuration config = vHostConfig.getStoreConfiguration();
-        File environmentPath = new File(config.getString(ENVIRONMENT_PATH_PROPERTY, "bdbEnv"));        
+        File environmentPath = new File(config.getString(ENVIRONMENT_PATH_PROPERTY, System.getProperty("QPID_WORK") + "/bdbstore/" + virtualHost.getName()));        
         if (!environmentPath.exists())
         {
             if (!environmentPath.mkdirs())