diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2007-01-25 10:43:56 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2007-01-25 10:43:56 +0000 |
| commit | ccb6fc811ecc0890aabfb79635b45b5d9e276acd (patch) | |
| tree | 440dd8b46f2614055fa64093788822ba8f5a4136 /cpp/src/IceBox/ServiceManagerI.cpp | |
| parent | Bug 1488. (diff) | |
| download | ice-ccb6fc811ecc0890aabfb79635b45b5d9e276acd.tar.bz2 ice-ccb6fc811ecc0890aabfb79635b45b5d9e276acd.tar.xz ice-ccb6fc811ecc0890aabfb79635b45b5d9e276acd.zip | |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1283
Diffstat (limited to 'cpp/src/IceBox/ServiceManagerI.cpp')
| -rw-r--r-- | cpp/src/IceBox/ServiceManagerI.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index b1672408cef..c3097d5b99e 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -372,6 +372,7 @@ IceBox::ServiceManagerI::start(const string& service, const string& entryPoint, // PropertiesPtr properties = _communicator->getProperties(); + if(properties->getPropertyAsInt("IceBox.UseSharedCommunicator." + service) > 0) { PropertiesPtr serviceProperties = createProperties(info.args, properties); @@ -402,7 +403,15 @@ IceBox::ServiceManagerI::start(const string& service, const string& entryPoint, else { string name = properties->getProperty("Ice.ProgramName"); - PropertiesPtr serviceProperties = createProperties(info.args, properties); + PropertiesPtr serviceProperties; + if(properties->getPropertyAsInt("IceBox.InheritContainerProperties") > 0) + { + serviceProperties = createProperties(info.args, properties); + } + else + { + serviceProperties = createProperties(info.args); + } if(name == serviceProperties->getProperty("Ice.ProgramName")) { |