summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/Database.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2005-09-09 09:11:57 +0000
committerBenoit Foucher <benoit@zeroc.com>2005-09-09 09:11:57 +0000
commitc0a57699ea87ef0c8850ff8aef4bde5f9ec972e0 (patch)
treeb362f5386068eace6a61031dd175ad066a645cd3 /cpp/src/IceGrid/Database.cpp
parenthttp://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=335 (diff)
downloadice-c0a57699ea87ef0c8850ff8aef4bde5f9ec972e0.tar.bz2
ice-c0a57699ea87ef0c8850ff8aef4bde5f9ec972e0.tar.xz
ice-c0a57699ea87ef0c8850ff8aef4bde5f9ec972e0.zip
Added new proxy methods: ice_getEndpoints(), ice_getAdapterId(),
ice_newEndpoints(), ice_newAdapterId().
Diffstat (limited to 'cpp/src/IceGrid/Database.cpp')
-rw-r--r--cpp/src/IceGrid/Database.cpp7
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;
}