diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-04-28 16:24:03 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-04-28 16:24:03 +0000 |
| commit | bf3729b95ca9928b07babe4f1216883cdc37086b (patch) | |
| tree | 1a8b2720f3200f4bf705d4d4c12dddcf064be6bf /cpp/src/IceGrid/Database.cpp | |
| parent | Adding warning comments about changing toString() behaviors that may break (diff) | |
| download | ice-bf3729b95ca9928b07babe4f1216883cdc37086b.tar.bz2 ice-bf3729b95ca9928b07babe4f1216883cdc37086b.tar.xz ice-bf3729b95ca9928b07babe4f1216883cdc37086b.zip | |
More allocation fixes, removed session based Query interface.
Diffstat (limited to 'cpp/src/IceGrid/Database.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Database.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index 4c42402f886..92f6fbc8946 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -743,7 +743,7 @@ Database::getAdapter(const string& id, const string& replicaGroupId) } vector<pair<string, AdapterPrx> > -Database::getAdapters(const string& id, bool allRegistered, int& endpointCount) +Database::getAdapters(const string& id, bool allRegistered, int& endpointCount, const SessionIPtr& session) { // // First we check if the given adapter id is associated to a @@ -752,7 +752,7 @@ Database::getAdapters(const string& id, bool allRegistered, int& endpointCount) // try { - return _adapterCache.get(id)->getProxies(allRegistered, endpointCount); + return _adapterCache.get(id)->getProxies(allRegistered, endpointCount, session); } catch(AdapterNotExistException&) { @@ -977,15 +977,14 @@ Database::releaseObject(const Ice::Identity& id, const SessionIPtr& session) } Ice::ObjectPrx -Database::getObjectProxy(const Ice::Identity& id) +Database::getObjectProxy(const Ice::Identity& id, const SessionIPtr& session) { try { // // Only return proxies for non allocatable objects. // - ObjectEntryPtr entry = _objectCache.get(id); - return entry->allocatable() ? Ice::ObjectPrx() : entry->getProxy(); + return _objectCache.get(id)->getProxy(session); } catch(ObjectNotRegisteredException&) { |