diff options
author | Mark Spruiell <mes@zeroc.com> | 2013-10-10 16:36:59 -0700 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2013-10-10 16:36:59 -0700 |
commit | 2f20f24360729d4833382948948b05f36269f44e (patch) | |
tree | 1d6ac4ef951993c233ab865a486584b9db4fe2e8 /java/src/IceBox/ServiceManagerI.java | |
parent | Fix version dependency in Ubuntu meta packages (diff) | |
download | ice-2f20f24360729d4833382948948b05f36269f44e.tar.bz2 ice-2f20f24360729d4833382948948b05f36269f44e.tar.xz ice-2f20f24360729d4833382948948b05f36269f44e.zip |
minor edits to IceBox comments
Diffstat (limited to 'java/src/IceBox/ServiceManagerI.java')
-rw-r--r-- | java/src/IceBox/ServiceManagerI.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java index 32515847bd8..3b6d4770dc3 100644 --- a/java/src/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/ServiceManagerI.java @@ -297,8 +297,8 @@ public class ServiceManagerI extends _ServiceManagerDisp // // Check if some services are using the shared communicator in which - // case we create the shared communicator now with a property set which - // is the union of all the service properties (services which are using + // case we create the shared communicator now with a property set that + // is the union of all the service properties (from services that use // the shared communicator). // if(properties.getPropertiesForPrefix("IceBox.UseSharedCommunicator.").size() > 0) @@ -321,9 +321,7 @@ public class ServiceManagerI extends _ServiceManagerDisp service.args = serviceArgs.value; // - // Erase properties from the shared communicator which don't exist in the - // service properties (which include the shared communicator properties - // overriden by the service properties). + // Remove properties from the shared property set that a service explicitly clears. // java.util.Map<String, String> allProps = initData.properties.getPropertiesForPrefix(""); for(String key : allProps.keySet()) @@ -344,7 +342,7 @@ public class ServiceManagerI extends _ServiceManagerDisp // // Parse <service>.* command line options (the Ice command line options - // were parsed by the createProperties above) + // were parsed by the call to createProperties above). // service.args = initData.properties.parseCommandLineOptions(service.name, service.args); } |