- Bug 4286: added support for IceStorm/IceGrid database plugins

- Fixed IceGrid database code to first save to the database and then
  do state changes.

1 files changed, 9 insertions, 36 deletions

diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp
index 1825d7d5e49..8cdec342096 100644
--- a/cpp/src/IceGrid/Topics.cpp
+++ b/cpp/src/IceGrid/Topics.cpp
@@ -496,19 +496,10 @@ NodeObserverTopic::initObserver(const Ice::ObjectPrx& obsv)
 }
 
 ApplicationObserverTopic::ApplicationObserverTopic(const IceStorm::TopicManagerPrx& topicManager,
-                                                   const StringApplicationInfoDict& applications) :
-    ObserverTopic(topicManager, "ApplicationObserver")
-#ifndef _RWSTD_NO_MEMBER_TEMPLATES
-    ,_applications(applications.begin(), applications.end())
-#endif
+                                                   const map<string, ApplicationInfo>& applications) :
+    ObserverTopic(topicManager, "ApplicationObserver"),
+    _applications(applications)
 {
-#ifdef _RWSTD_NO_MEMBER_TEMPLATES
-    for(StringApplicationInfoDict::const_iterator p = applications.begin(); p != applications.end(); ++p)
-    {
-        _applications[p->first] = p->second;
-    }
-#endif
-
     const_cast<ApplicationObserverPrx&>(_publisher) = ApplicationObserverPrx::uncheckedCast(_basePublisher);
 }
 
@@ -653,19 +644,10 @@ ApplicationObserverTopic::initObserver(const Ice::ObjectPrx& obsv)
 }
 
 AdapterObserverTopic::AdapterObserverTopic(const IceStorm::TopicManagerPrx& topicManager,
-                                           const StringAdapterInfoDict& adapters) :
-    ObserverTopic(topicManager, "AdapterObserver")
-#ifndef _RWSTD_NO_MEMBER_TEMPLATES
-    , _adapters(adapters.begin(), adapters.end())
-#endif
+                                           const map<string, AdapterInfo>& adapters) :
+    ObserverTopic(topicManager, "AdapterObserver"),
+    _adapters(adapters)
 {
-#ifdef _RWSTD_NO_MEMBER_TEMPLATES
-    for(StringAdapterInfoDict::const_iterator p = adapters.begin(); p != adapters.end(); ++p)
-    {
-        _adapters[p->first] = p->second;
-    }
-#endif
-
     const_cast<AdapterObserverPrx&>(_publisher) = AdapterObserverPrx::uncheckedCast(_basePublisher);
 }
 
@@ -778,19 +760,10 @@ AdapterObserverTopic::initObserver(const Ice::ObjectPrx& obsv)
 }
 
 ObjectObserverTopic::ObjectObserverTopic(const IceStorm::TopicManagerPrx& topicManager,
-                                         const IdentityObjectInfoDict& objects) :
-    ObserverTopic(topicManager, "ObjectObserver")
-#ifndef _RWSTD_NO_MEMBER_TEMPLATES
-    , _objects(objects.begin(), objects.end())
-#endif
+                                         const map<Ice::Identity, ObjectInfo>& objects) :
+    ObserverTopic(topicManager, "ObjectObserver"),
+    _objects(objects)
 {
-#ifdef _RWSTD_NO_MEMBER_TEMPLATES
-    for(IdentityObjectInfoDict::const_iterator p = objects.begin(); p != objects.end(); ++p)
-    {
-        _objects[p->first] = p->second;
-    }
-#endif
-    
     const_cast<ObjectObserverPrx&>(_publisher) = ObjectObserverPrx::uncheckedCast(_basePublisher);
 }