summaryrefslogtreecommitdiff
path: root/cpp/src/IceBox/Admin.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2006-08-22 00:06:02 +0000
committerMark Spruiell <mes@zeroc.com>2006-08-22 00:06:02 +0000
commita21245de493fd741e3a561adfdb1ca951c30145c (patch)
tree566960b5671ec08fb74b15e45a0084c7e24b7ec9 /cpp/src/IceBox/Admin.cpp
parentminor reorg (diff)
downloadice-a21245de493fd741e3a561adfdb1ca951c30145c.tar.bz2
ice-a21245de493fd741e3a561adfdb1ca951c30145c.tar.xz
ice-a21245de493fd741e3a561adfdb1ca951c30145c.zip
bug 1156: removing deprecated Identity properties
Diffstat (limited to 'cpp/src/IceBox/Admin.cpp')
-rw-r--r--cpp/src/IceBox/Admin.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp
index bc5c89c9af6..4259cd7816b 100644
--- a/cpp/src/IceBox/Admin.cpp
+++ b/cpp/src/IceBox/Admin.cpp
@@ -83,14 +83,9 @@ Client::run(int argc, char* argv[])
}
PropertiesPtr properties = communicator()->getProperties();
- string managerIdentity = properties->getProperty("IceBox.ServiceManager.Identity");
- if(managerIdentity.empty())
- {
- managerIdentity = properties->getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager";
- }
+ string managerIdentity = properties->getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager";
string managerProxy;
-
if(properties->getProperty("Ice.Default.Locator").empty())
{
string managerEndpoints = properties->getProperty("IceBox.ServiceManager.Endpoints");