diff options
Diffstat (limited to 'cpp/src/IceGrid/AdminI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/AdminI.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp index 30319133b76..25f76afaf03 100644 --- a/cpp/src/IceGrid/AdminI.cpp +++ b/cpp/src/IceGrid/AdminI.cpp @@ -574,32 +574,32 @@ AdminI::isServerEnabled(const ::std::string& id, const Ice::Current&) const } } -StringObjectProxyDict -AdminI::getAdapterEndpoints(const string& adapterId, const Current&) const +AdapterInfoSeq +AdminI::getAdapterInfo(const string& id, const Current&) const { int count; - vector<pair<string, AdapterPrx> > adapters = _database->getAdapters(adapterId, true, count); - StringObjectProxyDict adpts; + 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 { - adpts[p->first] = p->second->getDirectProxy(); + info.proxy = p->second->getDirectProxy(); } catch(const Ice::ObjectNotExistException&) { + continue; } catch(const Ice::Exception&) { - adpts[p->first] = 0; } } - else - { - adpts[p->first] = 0; - } + adpts.push_back(info); } return adpts; } |