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

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2008-07-21 07:44:45 -0400 (Mon, 21 Jul 2008)
New Revision: 2209

Modified:
   store/branches/mrg-1.0/cpp/lib/BdbMessageStore.cpp
Log:
Backport of trunk r.2208: Corrected lock placed in TPL store late initialization check which takes the lock unnecessarily and effectively single-threads all transactions.

Modified: store/branches/mrg-1.0/cpp/lib/BdbMessageStore.cpp
===================================================================
--- store/branches/mrg-1.0/cpp/lib/BdbMessageStore.cpp	2008-07-21 11:32:45 UTC (rev 2208)
+++ store/branches/mrg-1.0/cpp/lib/BdbMessageStore.cpp	2008-07-21 11:44:45 UTC (rev 2209)
@@ -262,10 +262,13 @@
 
 void BdbMessageStore::chkTplStoreInit()
 {
-    qpid::sys::Mutex::ScopedLock sl(jrnlCreateLock);
-    journal::jdir::create_dir(getTplBaseDir());
-    if (!tplStorePtr->is_ready()) {
-        tplStorePtr->initialize(tplNumJrnlFiles, tplJrnlFsizeSblks, tplWCacheNumPages, tplWCachePgSizeSblks);
+    if (!tplStorePtr->is_ready())
+    {
+        qpid::sys::Mutex::ScopedLock sl(jrnlCreateLock);
+        if (!tplStorePtr->is_ready()) {
+            journal::jdir::create_dir(getTplBaseDir());
+            tplStorePtr->initialize(tplNumJrnlFiles, tplJrnlFsizeSblks, tplWCacheNumPages, tplWCachePgSizeSblks);
+        }
     }
 }