diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-01-17 15:48:26 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-01-17 15:48:26 +0100 |
| commit | cade94b03f44c09a65542d58746e111a997477c1 (patch) | |
| tree | 47c62bd60c8fa62587c271d5e16de711bf973243 /cpp/src/IceGrid/AdminSessionI.cpp | |
| parent | Added OS X Frameworks (diff) | |
| download | ice-cade94b03f44c09a65542d58746e111a997477c1.tar.bz2 ice-cade94b03f44c09a65542d58746e111a997477c1.tar.xz ice-cade94b03f44c09a65542d58746e111a997477c1.zip | |
Fixed ICE-4968 - Support for 1.0 observers with IceGrid
Diffstat (limited to 'cpp/src/IceGrid/AdminSessionI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/AdminSessionI.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp index 8cabcba8fee..f201d595148 100644 --- a/cpp/src/IceGrid/AdminSessionI.cpp +++ b/cpp/src/IceGrid/AdminSessionI.cpp @@ -185,11 +185,11 @@ AdminSessionI::setObserversByIdentity(const Ice::Identity& registryObserver, throw ex; } - setupObserverSubscription(RegistryObserverTopicName, toProxy(registryObserver, current.con)); - setupObserverSubscription(NodeObserverTopicName, toProxy(nodeObserver, current.con)); - setupObserverSubscription(ApplicationObserverTopicName, toProxy(appObserver, current.con)); - setupObserverSubscription(AdapterObserverTopicName, toProxy(adapterObserver, current.con)); - setupObserverSubscription(ObjectObserverTopicName, toProxy(objectObserver, current.con)); + setupObserverSubscription(RegistryObserverTopicName, toProxy(registryObserver, current.con, current.encoding)); + setupObserverSubscription(NodeObserverTopicName, toProxy(nodeObserver, current.con, current.encoding)); + setupObserverSubscription(ApplicationObserverTopicName, toProxy(appObserver, current.con, current.encoding)); + setupObserverSubscription(AdapterObserverTopicName, toProxy(adapterObserver, current.con, current.encoding)); + setupObserverSubscription(ObjectObserverTopicName, toProxy(objectObserver, current.con, current.encoding)); } @@ -335,9 +335,9 @@ AdminSessionI::setupObserverSubscription(TopicName name, const Ice::ObjectPrx& o } Ice::ObjectPrx -AdminSessionI::toProxy(const Ice::Identity& id, const Ice::ConnectionPtr& connection) +AdminSessionI::toProxy(const Ice::Identity& id, const Ice::ConnectionPtr& connection, const Ice::EncodingVersion& v) { - return id.name.empty() ? Ice::ObjectPrx() : connection->createProxy(id); + return id.name.empty() ? Ice::ObjectPrx() : connection->createProxy(id)->ice_encodingVersion(v); } FileIteratorPrx |