summaryrefslogtreecommitdiff
path: root/cpp/src/IceBox/ServiceManagerI.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2013-10-10 16:36:59 -0700
committerMark Spruiell <mes@zeroc.com>2013-10-10 16:36:59 -0700
commit2f20f24360729d4833382948948b05f36269f44e (patch)
tree1d6ac4ef951993c233ab865a486584b9db4fe2e8 /cpp/src/IceBox/ServiceManagerI.cpp
parentFix version dependency in Ubuntu meta packages (diff)
downloadice-2f20f24360729d4833382948948b05f36269f44e.tar.bz2
ice-2f20f24360729d4833382948948b05f36269f44e.tar.xz
ice-2f20f24360729d4833382948948b05f36269f44e.zip
minor edits to IceBox comments
Diffstat (limited to 'cpp/src/IceBox/ServiceManagerI.cpp')
-rw-r--r--cpp/src/IceBox/ServiceManagerI.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index f301acfb5bb..3980e391ecb 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -347,8 +347,8 @@ IceBox::ServiceManagerI::start()
//
// 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).
//
PropertyDict sharedCommunicatorServices = properties->getPropertiesForPrefix("IceBox.UseSharedCommunicator.");
@@ -370,9 +370,7 @@ IceBox::ServiceManagerI::start()
PropertiesPtr svcProperties = createProperties(q->args, initData.properties);
//
- // 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.
//
PropertyDict allProps = initData.properties->getPropertiesForPrefix("");
for(PropertyDict::iterator p = allProps.begin(); p != allProps.end(); ++p)
@@ -394,7 +392,7 @@ IceBox::ServiceManagerI::start()
//
// Parse <service>.* command line options (the Ice command line options
- // were parsed by the createProperties above)
+ // were parsed by the call to createProperties above).
//
q->args = initData.properties->parseCommandLineOptions(q->name, q->args);
}