summaryrefslogtreecommitdiff
path: root/cpp/src/IceBox/ServiceManagerI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceBox/ServiceManagerI.cpp')
-rw-r--r--cpp/src/IceBox/ServiceManagerI.cpp7
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
{