diff options
author | Matthew Newhook <matthew@zeroc.com> | 2005-10-26 06:52:12 +0000 |
---|---|---|
committer | Matthew Newhook <matthew@zeroc.com> | 2005-10-26 06:52:12 +0000 |
commit | 4bce0d66a7fbe259a7cce305bfd9eeafe1812d55 (patch) | |
tree | 2a34dde5f7a960b8dbe7bad0ec0b159a08327bec /java/src/IceBox/ServiceManagerI.java | |
parent | Added C# implementation of IceBox. (diff) | |
download | ice-4bce0d66a7fbe259a7cce305bfd9eeafe1812d55.tar.bz2 ice-4bce0d66a7fbe259a7cce305bfd9eeafe1812d55.tar.xz ice-4bce0d66a7fbe259a7cce305bfd9eeafe1812d55.zip |
- Added handling of IceBox.InstanceName to the IceBox service manager.
- Use Hello.Proxy, not Hello.Hello in the IceBox demo.
- Remove shutdown() from IceBox hello demo.
Diffstat (limited to 'java/src/IceBox/ServiceManagerI.java')
-rw-r--r-- | java/src/IceBox/ServiceManagerI.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java index 15903140908..ae650f8e5fa 100644 --- a/java/src/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/ServiceManagerI.java @@ -50,6 +50,10 @@ public class ServiceManagerI extends _ServiceManagerDisp Ice.Properties properties = _server.communicator().getProperties(); String identity = properties.getPropertyWithDefault("IceBox.ServiceManager.Identity", "ServiceManager"); + if(identity.length() == 0) + { + identity = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager"; + } adapter.add(this, Ice.Util.stringToIdentity(identity)); // |