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/AdminI.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/AdminI.cpp')
-rw-r--r-- | cpp/src/IceGrid/AdminI.cpp | 52 |
1 files changed, 28 insertions, 24 deletions
diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp index 4f4bcd658aa..daa4045091d 100644 --- a/cpp/src/IceGrid/AdminI.cpp +++ b/cpp/src/IceGrid/AdminI.cpp @@ -577,30 +577,34 @@ AdminI::isServerEnabled(const ::std::string& id, const Ice::Current&) const AdapterInfoSeq AdminI::getAdapterInfo(const string& id, const Current&) const { - int count; - vector<pair<string, AdapterPrx> > adapters = _database->getAdapters(id, true, count); - AdapterInfoSeq adpts; - for(vector<pair<string, AdapterPrx> >::const_iterator p = adapters.begin(); p != adapters.end(); ++p) - { - AdapterInfo info; - info.id = p->first; - info.replicaGroupId = p->first != id ? id : ""; - if(p->second) - { - try - { - info.proxy = p->second->getDirectProxy(); - } - catch(const Ice::ObjectNotExistException&) - { - continue; - } - catch(const Ice::Exception&) - { - } - } - adpts.push_back(info); - } + // + // TODO: XXX + // + AdapterInfoSeq adpts; +// int count; +// vector<pair<string, AdapterPrx> > adapters = _database->getAdapters(id, true, count, 0); +// AdapterInfoSeq adpts; +// for(vector<pair<string, AdapterPrx> >::const_iterator p = adapters.begin(); p != adapters.end(); ++p) +// { +// AdapterInfo info; +// info.id = p->first; +// info.replicaGroupId = p->first != id ? id : ""; +// if(p->second) +// { +// try +// { +// info.proxy = p->second->getDirectProxy(); +// } +// catch(const Ice::ObjectNotExistException&) +// { +// continue; +// } +// catch(const Ice::Exception&) +// { +// } +// } +// adpts.push_back(info); +// } return adpts; } |