[rhmessaging-commits] rhmessaging commits: r3998 - store/trunk/cpp/lib.

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2010-06-01 12:02:36 -0400 (Tue, 01 Jun 2010)
New Revision: 3998

Modified:
   store/trunk/cpp/lib/MessageStoreImpl.cpp
Log:
Fix for Bug 598557: "qpidd --no-data dir with store loaded segfaults".

Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp
===================================================================
--- store/trunk/cpp/lib/MessageStoreImpl.cpp	2010-05-31 19:31:45 UTC (rev 3997)
+++ store/trunk/cpp/lib/MessageStoreImpl.cpp	2010-06-01 16:02:36 UTC (rev 3998)
@@ -361,7 +361,7 @@
 
 void MessageStoreImpl::finalize()
 {
-    if (tplStorePtr->is_ready()) tplStorePtr->stop(true);
+    if (tplStorePtr.get() && tplStorePtr->is_ready()) tplStorePtr->stop(true);
     {
         qpid::sys::Mutex::ScopedLock sl(journalListLock);
         for (JournalListMapItr i = journalList.begin(); i != journalList.end(); i++)