diff options
Diffstat (limited to 'cpp/src/IceBox/Admin.cpp')
-rw-r--r-- | cpp/src/IceBox/Admin.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp index 2704959139d..bc35e03fdd8 100644 --- a/cpp/src/IceBox/Admin.cpp +++ b/cpp/src/IceBox/Admin.cpp @@ -52,12 +52,6 @@ Client::usage() int Client::run(int argc, char* argv[]) { - PropertiesPtr properties = communicator()->getProperties(); - - StringSeq args = argsToStringSeq(argc, argv); - args = properties->parseCommandLineOptions("IceBox", args); - stringSeqToArgs(args, argc, argv); - vector<string> commands; int idx = 1; @@ -92,10 +86,11 @@ Client::run(int argc, char* argv[]) return EXIT_SUCCESS; } - string managerProxy; - + PropertiesPtr properties = communicator()->getProperties(); string managerIdentity = properties->getPropertyWithDefault("IceBox.ServiceManager.Identity", "ServiceManager"); + string managerProxy; + if(properties->getProperty("Ice.Default.Locator").empty()) { string managerEndpoints = properties->getProperty("IceBox.ServiceManager.Endpoints"); |