diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-05-29 09:51:28 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-05-29 09:51:28 +0000 |
| commit | a6cb3af17287c96cb1ed307b42fe9633d1905630 (patch) | |
| tree | 93dd4bfa368f581998fbcf20802e84fb3f22ef8e /cpp/src/IceGrid/NodeCache.cpp | |
| parent | More changes for inconsistent ice_* proxy methods (diff) | |
| download | ice-a6cb3af17287c96cb1ed307b42fe9633d1905630.tar.bz2 ice-a6cb3af17287c96cb1ed307b42fe9633d1905630.tar.xz ice-a6cb3af17287c96cb1ed307b42fe9633d1905630.zip | |
Property set bug fixes, locator tracing.
Diffstat (limited to 'cpp/src/IceGrid/NodeCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeCache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp index 42afc878e0f..f41506fa8aa 100644 --- a/cpp/src/IceGrid/NodeCache.cpp +++ b/cpp/src/IceGrid/NodeCache.cpp @@ -470,7 +470,7 @@ NodeEntry::getServerDescriptor(const ServerInfo& server, const SessionIPtr& sess NodeInfo info = _session->getInfo(); - Resolver resolve("server `" + server.descriptor->id + "'", map<string, string>()); + Resolver resolve("server `" + server.descriptor->id + "'", map<string, string>(), _cache.getCommunicator()); resolve.setReserved("application", server.application); resolve.setReserved("node", server.node); resolve.setReserved("server", server.descriptor->id); @@ -489,10 +489,10 @@ NodeEntry::getServerDescriptor(const ServerInfo& server, const SessionIPtr& sess IceBoxDescriptorPtr iceBox = IceBoxDescriptorPtr::dynamicCast(server.descriptor); if(iceBox) { - return IceBoxHelper(_cache.getCommunicator(), iceBox).instantiate(resolve, PropertySetDescriptor()); + return IceBoxHelper(_cache.getCommunicator(), iceBox).instantiate(resolve, PropertyDescriptorSeq()); } else { - return ServerHelper(_cache.getCommunicator(), server.descriptor).instantiate(resolve, PropertySetDescriptor()); + return ServerHelper(_cache.getCommunicator(), server.descriptor).instantiate(resolve, PropertyDescriptorSeq()); } } |