The master now waits for the replicas to be updated before to return.

Added support for dynamic registration of adapters in the replicas.

1 files changed, 3 insertions, 0 deletions

diff --git a/cpp/src/IceGrid/Topics.h b/cpp/src/IceGrid/Topics.h
index d4c62e4805a..e17f3c9a438 100644
--- a/cpp/src/IceGrid/Topics.h
+++ b/cpp/src/IceGrid/Topics.h
@@ -37,6 +37,7 @@ public:
     virtual ~ObserverTopic();
 
     void subscribe(const Ice::ObjectPrx&, int = -1);
+    void subscribeAndWaitForSubscription(const Ice::ObjectPrx&);
     void unsubscribe(const Ice::ObjectPrx&);
     void destroy();
 
@@ -46,9 +47,11 @@ protected:
 
     void subscribeImpl(const Ice::ObjectPrx&);
     void updateSerial(int);
+    Ice::Context getContext(const std::string&, int) const;
 
     IceStorm::TopicPrx _topic;
     Ice::ObjectPrx _basePublisher;
+    std::set<Ice::Identity> _waitForSubscribe;
     int _serial;    
 };
 typedef IceUtil::Handle<ObserverTopic> ObserverTopicPtr;