Fixed (ICE-4858) - Eliminate IceDB

1 files changed, 9 insertions, 9 deletions

diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp
index d5a6460a481..efdc21492c9 100644
--- a/cpp/src/IceGrid/Topics.cpp
+++ b/cpp/src/IceGrid/Topics.cpp
@@ -561,9 +561,9 @@ NodeObserverTopic::initObserver(const Ice::ObjectPrx& obsv)
 }
 
 ApplicationObserverTopic::ApplicationObserverTopic(const IceStorm::TopicManagerPrx& topicManager,
-                                                   const ApplicationsWrapperPtr& wrapper) :
-    ObserverTopic(topicManager, "ApplicationObserver", wrapper->getSerial()),
-    _applications(wrapper->getMap())
+                                                   const map<string, ApplicationInfo>& applications, Ice::Long serial) :
+    ObserverTopic(topicManager, "ApplicationObserver", serial),
+    _applications(applications)
 {
     _publishers = getPublishers<ApplicationObserverPrx>();
 }
@@ -726,9 +726,9 @@ ApplicationObserverTopic::initObserver(const Ice::ObjectPrx& obsv)
 }
 
 AdapterObserverTopic::AdapterObserverTopic(const IceStorm::TopicManagerPrx& topicManager,
-                                           const AdaptersWrapperPtr& wrapper) :
-    ObserverTopic(topicManager, "AdapterObserver", wrapper->getSerial()),
-    _adapters(wrapper->getMap())
+                                           const map<string, AdapterInfo>& adapters, Ice::Long serial) :
+    ObserverTopic(topicManager, "AdapterObserver", serial),
+    _adapters(adapters)
 {
     _publishers = getPublishers<AdapterObserverPrx>();
 }
@@ -854,9 +854,9 @@ AdapterObserverTopic::initObserver(const Ice::ObjectPrx& obsv)
 }
 
 ObjectObserverTopic::ObjectObserverTopic(const IceStorm::TopicManagerPrx& topicManager,
-                                         const ObjectsWrapperPtr& wrapper) :
-    ObserverTopic(topicManager, "ObjectObserver", wrapper->getSerial()),
-    _objects(wrapper->getMap())
+                                         const map<Ice::Identity, ObjectInfo>& objects, Ice::Long serial) :
+    ObserverTopic(topicManager, "ObjectObserver", serial),
+    _objects(objects)
 {
     _publishers = getPublishers<ObjectObserverPrx>();
 }