[rhmessaging-commits] rhmessaging commits: r2205 - store/branches/mrg-1.0/cpp/lib.

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2008-07-17 15:49:11 -0400 (Thu, 17 Jul 2008)
New Revision: 2205

Modified:
   store/branches/mrg-1.0/cpp/lib/BdbMessageStore.cpp
Log:
Bugfix from r2193: two params reversed on JournalImpl::initialize(). Also moved creation of TPL dir to time of TPL initialize.

Modified: store/branches/mrg-1.0/cpp/lib/BdbMessageStore.cpp
===================================================================
--- store/branches/mrg-1.0/cpp/lib/BdbMessageStore.cpp	2008-07-16 20:25:52 UTC (rev 2204)
+++ store/branches/mrg-1.0/cpp/lib/BdbMessageStore.cpp	2008-07-17 19:49:11 UTC (rev 2205)
@@ -220,7 +220,6 @@
     if (dir.size()>0) storeDir = dir;
 
     journal::jdir::create_dir(getBdbBaseDir());
-    journal::jdir::create_dir(getPxidBaseDir());
 
     try {
         env.open(getBdbBaseDir().c_str(), DB_THREAD | DB_CREATE | DB_INIT_TXN | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_USE_ENVIRON, 0);
@@ -264,8 +263,9 @@
 void BdbMessageStore::chkInitPreparedXidStore()
 {
     qpid::sys::Mutex::ScopedLock sl(jrnlCreateLock);
+    journal::jdir::create_dir(getPxidBaseDir());
     if (!preparedXidStorePtr->is_ready()) {
-        preparedXidStorePtr->initialize(tplNumJrnlFiles, tplJrnlFsizeSblks, tplWCachePgSizeSblks, tplWCacheNumPages);
+        preparedXidStorePtr->initialize(tplNumJrnlFiles, tplJrnlFsizeSblks, tplWCacheNumPages, tplWCachePgSizeSblks);
     }
 }