diff options
Diffstat (limited to 'cpp/src/IceGrid/Parser.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Parser.cpp | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp index a6244cd3018..cc5e894a15d 100644 --- a/cpp/src/IceGrid/Parser.cpp +++ b/cpp/src/IceGrid/Parser.cpp @@ -927,25 +927,15 @@ Parser::endpointsAdapter(const list<string>& args) void Parser::removeAdapter(const list<string>& args) { - if(args.size() < 1) + if(args.size() != 1) { - error("`adapter remove' requires at least one argument\n(`help' for more info)"); + error("`adapter remove' requires exactly one argument\n(`help' for more info)"); return; } try { - list<string>::const_iterator p = args.begin(); - string adapterId = *p++; - StringObjectProxyDict proxies = _admin->getAdapterEndpoints(adapterId); - if(args.size() > 1) - { - _admin->removeAdapterWithReplicaId(adapterId, *p++); - } - else - { - _admin->removeAdapter(adapterId); - } + _admin->removeAdapter(*args.begin()); } catch(const Ice::Exception& ex) { |