diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-09-20 18:40:45 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-09-20 18:40:45 -0400 |
| commit | 61ca91ebcac8a6d3c24070d1018869eafaac44e5 (patch) | |
| tree | 1a1ec8a5c717b5e6479887a1ea3714023bdfc39c /cpp/src/IceBox/ServiceManagerI.cpp | |
| parent | Squashed commit of the following: (diff) | |
| download | ice-61ca91ebcac8a6d3c24070d1018869eafaac44e5.tar.bz2 ice-61ca91ebcac8a6d3c24070d1018869eafaac44e5.tar.xz ice-61ca91ebcac8a6d3c24070d1018869eafaac44e5.zip | |
InheritProperties no longer inherits Ice.Admin.Endpoints
Diffstat (limited to 'cpp/src/IceBox/ServiceManagerI.cpp')
| -rw-r--r-- | cpp/src/IceBox/ServiceManagerI.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index 8f8dd794376..0247005efc8 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -427,7 +427,12 @@ IceBox::ServiceManagerI::start(const string& service, const string& entryPoint, PropertiesPtr serviceProperties; if(properties->getPropertyAsInt("IceBox.InheritProperties") > 0) { - serviceProperties = createProperties(info.args, properties); + // + // Inherit all except Ice.Admin.Endpoints! + // + serviceProperties = properties->clone(); + serviceProperties->setProperty("Ice.Admin.Endpoints", ""); + serviceProperties = createProperties(info.args, serviceProperties); } else { |