diff options
| author | Mark Spruiell <mes@zeroc.com> | 2006-08-22 00:06:02 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2006-08-22 00:06:02 +0000 |
| commit | a21245de493fd741e3a561adfdb1ca951c30145c (patch) | |
| tree | 566960b5671ec08fb74b15e45a0084c7e24b7ec9 /cpp/src/IceBox/ServiceManagerI.cpp | |
| parent | minor reorg (diff) | |
| download | ice-a21245de493fd741e3a561adfdb1ca951c30145c.tar.bz2 ice-a21245de493fd741e3a561adfdb1ca951c30145c.tar.xz ice-a21245de493fd741e3a561adfdb1ca951c30145c.zip | |
bug 1156: removing deprecated Identity properties
Diffstat (limited to 'cpp/src/IceBox/ServiceManagerI.cpp')
| -rw-r--r-- | cpp/src/IceBox/ServiceManagerI.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index 207c6a61f00..721aacdf695 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -62,11 +62,7 @@ IceBox::ServiceManagerI::start() ObjectAdapterPtr adapter = _communicator->createObjectAdapter("IceBox.ServiceManager"); PropertiesPtr properties = _communicator->getProperties(); - string identity = properties->getProperty("IceBox.ServiceManager.Identity"); - if(identity.empty()) - { - identity = properties->getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager"; - } + string identity = properties->getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager"; adapter->add(obj, _communicator->stringToIdentity(identity)); // |