Fixed IceGrid bugs 1381, 1382, 1369, 1342, 1341, 1334

1 files changed, 2 insertions, 10 deletions

diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index a0af0caa448..645a7f60475 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -497,18 +497,10 @@ NodeEntry::getServerDescriptor(const ServerInfo& server, const SessionIPtr& sess
 {
     assert(_session);
 
-    NodeInfo info = _session->getInfo();
-    
-    Resolver resolve("server `" + server.descriptor->id + "'", map<string, string>(), _cache.getCommunicator());
+    Resolver resolve(_session->getInfo(), _cache.getCommunicator());
     resolve.setReserved("application", server.application);
-    resolve.setReserved("node", server.node);
     resolve.setReserved("server", server.descriptor->id);
-    resolve.setReserved("node.os", info.os);
-    resolve.setReserved("node.hostname", info.hostname);
-    resolve.setReserved("node.release", info.release);
-    resolve.setReserved("node.version", info.version);
-    resolve.setReserved("node.machine", info.machine);
-    resolve.setReserved("node.datadir", info.dataDir);
+    resolve.setContext("server `${server}'");
 
     if(session)
     {