[rhmessaging-commits] rhmessaging commits: r1486 - in store/trunk/cpp/lib: jrnl and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2007-12-14 09:05:58 -0500 (Fri, 14 Dec 2007)
New Revision: 1486

Modified:
   store/trunk/cpp/lib/BdbMessageStore.cpp
   store/trunk/cpp/lib/BdbMessageStore.h
   store/trunk/cpp/lib/jrnl/jexception.cpp
Log:
Minor bugfix for jexception, and possible fix for BZ 423981 (subject to testing)

Modified: store/trunk/cpp/lib/BdbMessageStore.cpp
===================================================================
--- store/trunk/cpp/lib/BdbMessageStore.cpp	2007-12-13 22:12:30 UTC (rev 1485)
+++ store/trunk/cpp/lib/BdbMessageStore.cpp	2007-12-14 14:05:58 UTC (rev 1486)
@@ -992,6 +992,7 @@
     try {
 
         if ( queue && usingJrnl()) {
+            qpid::sys::Mutex::ScopedLock s(jrnlWriteLock);
             boost::intrusive_ptr<DataTokenImpl> dtokp(new DataTokenImpl);
             dtokp->addRef();
 	        dtokp->setSourceMessage(message);
@@ -1135,7 +1136,7 @@
     intrusive_ptr<PersistableMessage>& msg,
     const PersistableQueue& queue)
 {
-    //std::cout << "D" << std::flush;
+    qpid::sys::Mutex::ScopedLock s(jrnlWriteLock);
     bool written = false;
     boost::intrusive_ptr<DataTokenImpl> ddtokp(new DataTokenImpl);
     ddtokp->addRef();

Modified: store/trunk/cpp/lib/BdbMessageStore.h
===================================================================
--- store/trunk/cpp/lib/BdbMessageStore.h	2007-12-13 22:12:30 UTC (rev 1485)
+++ store/trunk/cpp/lib/BdbMessageStore.h	2007-12-14 14:05:58 UTC (rev 1486)
@@ -84,6 +84,7 @@
             u_int16_t numJrnlFiles;
             u_int32_t jrnlFsizePgs;
 			bool isInit;
+            mutable qpid::sys::Mutex jrnlWriteLock;
 			const char* envPath;
             static qpid::sys::Duration defJournalGetEventsTimeout;
             static qpid::sys::Duration defJournalFlushTimeout;

Modified: store/trunk/cpp/lib/jrnl/jexception.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jexception.cpp	2007-12-13 22:12:30 UTC (rev 1485)
+++ store/trunk/cpp/lib/jrnl/jexception.cpp	2007-12-14 14:05:58 UTC (rev 1486)
@@ -131,7 +131,7 @@
             oss << " ";
     }
     if (tf)
-        oss << _throwing_class << "() ";
+        oss << _throwing_fn << "() ";
     if (tc || tf)
         oss << "threw " << jerrno::err_msg(_err_code);
     if (ai)