From 44bd0c07505a6841f4315eedcab0a228a6819852 Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Fri, 16 Nov 2012 15:52:28 +0100 Subject: Added support for proxy-options to IceGrid adapter, replica group and object descriptors --- cpp/src/IceGrid/ServerCache.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'cpp/src/IceGrid/ServerCache.cpp') diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp index 4901b6752b4..8d6cf543a5e 100644 --- a/cpp/src/IceGrid/ServerCache.cpp +++ b/cpp/src/IceGrid/ServerCache.cpp @@ -209,18 +209,11 @@ ServerCache::addCommunicator(const CommunicatorDescriptorPtr& comm, for(ObjectDescriptorSeq::const_iterator r = q->objects.begin(); r != q->objects.end(); ++r) { - ObjectInfo info; - info.type = r->type; - info.proxy = _communicator->stringToProxy("\"" + _communicator->identityToString(r->id) + "\" @ " + q->id); - _objectCache.add(info, application); + _objectCache.add(toObjectInfo(_communicator, *r, q->id), application); } - for(ObjectDescriptorSeq::const_iterator r = q->allocatables.begin(); r != q->allocatables.end(); ++r) { - ObjectInfo info; - info.type = r->type; - info.proxy = _communicator->stringToProxy("\"" + _communicator->identityToString(r->id) + "\" @ " + q->id); - _allocatableObjectCache.add(info, server); + _allocatableObjectCache.add(toObjectInfo(_communicator, *r, q->id), server); } } } -- cgit v1.2.3