diff options
| author | Michi Henning <michi@zeroc.com> | 2007-11-26 12:06:11 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2007-11-26 12:06:11 +1000 |
| commit | 6c4512e4ca81944c22042c833956c8c80c1eedeb (patch) | |
| tree | 6334ea8cad1dd927879473472cd26d3596e2e8ee /cpp/src/IceGrid/AdminI.cpp | |
| parent | Bug 2474. (diff) | |
| parent | minor edits (diff) | |
| download | ice-6c4512e4ca81944c22042c833956c8c80c1eedeb.tar.bz2 ice-6c4512e4ca81944c22042c833956c8c80c1eedeb.tar.xz ice-6c4512e4ca81944c22042c833956c8c80c1eedeb.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/IceGrid/AdminI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/AdminI.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp index 92913149d43..0f41bfbd9cd 100644 --- a/cpp/src/IceGrid/AdminI.cpp +++ b/cpp/src/IceGrid/AdminI.cpp @@ -358,27 +358,12 @@ AdminI::getServerPid(const string& id, const Current&) const } } -Ice::PropertyDict -AdminI::getServerProperties(const string& id, const Current&) const -{ - ServerProxyWrapper proxy(_database, id); - try - { - return proxy->getProperties(); - } - catch(const Ice::Exception& ex) - { - proxy.handleException(ex); - return Ice::PropertyDict(); - } -} - Ice::ObjectPrx AdminI::getServerAdmin(const string& id, const Current& current) const { Ice::Identity adminId; adminId.name = id; - adminId.category =_registry->getServerAdminCategory(); + adminId.category = _registry->getServerAdminCategory(); return current.adapter->createProxy(adminId); } |