diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2005-10-20 10:32:03 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2005-10-20 10:32:03 +0000 |
| commit | 99d45a62dbf19c1690e3bb0e9f0c073571385beb (patch) | |
| tree | 2f151051d7064e3f5aa49aefe2bd548adea19eb0 /cpp/src/IceBox/ServiceManagerI.cpp | |
| parent | Fixed bug 527. (diff) | |
| download | ice-99d45a62dbf19c1690e3bb0e9f0c073571385beb.tar.bz2 ice-99d45a62dbf19c1690e3bb0e9f0c073571385beb.tar.xz ice-99d45a62dbf19c1690e3bb0e9f0c073571385beb.zip | |
Added IceBox.InstanceName
Diffstat (limited to 'cpp/src/IceBox/ServiceManagerI.cpp')
| -rw-r--r-- | cpp/src/IceBox/ServiceManagerI.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index 216e4f5abae..f760bd66b97 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -65,8 +65,11 @@ IceBox::ServiceManagerI::run() ObjectAdapterPtr adapter = _server->communicator()->createObjectAdapter("IceBox.ServiceManager"); PropertiesPtr properties = _server->communicator()->getProperties(); - - string identity = properties->getPropertyWithDefault("IceBox.ServiceManager.Identity", "ServiceManager"); + string identity = properties->getProperty("IceBox.ServiceManager.Identity"); + if(identity.empty()) + { + identity = properties->getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager"; + } adapter->add(obj, stringToIdentity(identity)); // |