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

[rhmessaging-commits at lists.jboss.org]

Author: tedross
Date: 2010-04-23 17:01:54 -0400 (Fri, 23 Apr 2010)
New Revision: 3927

Modified:
   store/trunk/cpp/lib/JournalImpl.cpp
   store/trunk/cpp/lib/MessageStoreImpl.cpp
   store/trunk/cpp/lib/StorePlugin.cpp
Log:
Use cleaned-up version of ManagementAgent::addObject for durable objects.
Moved initManagement into the early initialization.


Modified: store/trunk/cpp/lib/JournalImpl.cpp
===================================================================
--- store/trunk/cpp/lib/JournalImpl.cpp	2010-04-23 19:34:08 UTC (rev 3926)
+++ store/trunk/cpp/lib/JournalImpl.cpp	2010-04-23 21:01:54 UTC (rev 3927)
@@ -94,7 +94,7 @@
         _mgmtObject->set_writePageSize(0);
         _mgmtObject->set_writePages(0);
 
-        _agent->addObject(_mgmtObject);
+        _agent->addObject(_mgmtObject, 0, true);
     }
 
     log(LOG_NOTICE, "Created");

Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp
===================================================================
--- store/trunk/cpp/lib/MessageStoreImpl.cpp	2010-04-23 19:34:08 UTC (rev 3926)
+++ store/trunk/cpp/lib/MessageStoreImpl.cpp	2010-04-23 21:01:54 UTC (rev 3927)
@@ -233,7 +233,7 @@
             mgmtObject->set_tplDataFileSize(tplJrnlFsizeSblks * JRNL_SBLK_SIZE * JRNL_DBLK_SIZE);
             mgmtObject->set_tplCurrentFileCount(tplNumJrnlFiles);
 
-            agent->addObject(mgmtObject, 0x1000000000000050LL);
+            agent->addObject(mgmtObject, 0, true);
         }
     }
 }

Modified: store/trunk/cpp/lib/StorePlugin.cpp
===================================================================
--- store/trunk/cpp/lib/StorePlugin.cpp	2010-04-23 19:34:08 UTC (rev 3926)
+++ store/trunk/cpp/lib/StorePlugin.cpp	2010-04-23 21:01:54 UTC (rev 3927)
@@ -57,13 +57,12 @@
         static_cast<mrg::msgstore::MessageStoreImpl*>(sp)->init(&options);
         broker->setStore (store);
         target.addFinalizer(boost::bind(&StorePlugin::finalize, this));
+        static_cast<mrg::msgstore::MessageStoreImpl*>(sp)->initManagement(broker);
     }
 
-    void initialize(Plugin::Target& target)
+    void initialize(Plugin::Target&)
     {
-        Broker* broker = dynamic_cast<Broker*>(&target);
-        MessageStore* sp = store.get();
-        static_cast<mrg::msgstore::MessageStoreImpl*>(sp)->initManagement(broker);
+        // This function intentionally left blank
     }
 
     void finalize()