diff options
Diffstat (limited to 'cpp/src/IceGrid/Database.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Database.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index ba85d3163af..3e13b50f06a 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -777,13 +777,11 @@ Database::updateObject(const Ice::ObjectPrx& proxy) } Ice::ObjectPrx -Database::getObjectProxy(const Ice::Identity& id, string& adapterId) +Database::getObjectProxy(const Ice::Identity& id) { try { - ObjectEntryPtr object = _objectCache.get(id); - adapterId = object->getAdapterId(); - return object->getProxy(); + return _objectCache.get(id)->getProxy(); } catch(ObjectNotExistException&) { @@ -798,7 +796,6 @@ Database::getObjectProxy(const Ice::Identity& id, string& adapterId) ex.id = id; throw ex; } - adapterId = ""; return p->second.proxy; } |