Fixed proxy and identity t/from string functions to use string converters

1 files changed, 6 insertions, 3 deletions

diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index 0005462bbf8..be0f4d91f5d 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -155,7 +155,9 @@ private:
 
 };
 
-NodeCache::NodeCache(int sessionTimeout) : _sessionTimeout(sessionTimeout)
+NodeCache::NodeCache(const Ice::CommunicatorPtr& communicator, int sessionTimeout) :
+    _communicator(communicator),
+    _sessionTimeout(sessionTimeout)
 {
 }
 
@@ -457,11 +459,12 @@ NodeEntry::getServerDescriptor(const ServerInfo& server)
 	IceBoxDescriptorPtr iceBox = IceBoxDescriptorPtr::dynamicCast(server.descriptor);
 	if(iceBox)
 	{
-	    return IceBoxHelper(iceBox).instantiate(resolve, PropertySetDescriptor());
+	    return IceBoxHelper(_cache.getCommunicator(), iceBox).instantiate(resolve, PropertySetDescriptor());
 	}
 	else
 	{
-	    return ServerHelper(server.descriptor).instantiate(resolve, PropertySetDescriptor());
+	    return ServerHelper(_cache.getCommunicator(), server.descriptor).instantiate(resolve, 
+	    										 PropertySetDescriptor());
 	}
     }
     catch(const DeploymentException& ex)