diff options
Diffstat (limited to 'java/src/IceBox/ServiceManagerI.java')
| -rw-r--r-- | java/src/IceBox/ServiceManagerI.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java index c810ce9531b..31f5277f837 100644 --- a/java/src/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/ServiceManagerI.java @@ -441,7 +441,12 @@ public class ServiceManagerI extends _ServiceManagerDisp Ice.Properties serviceProperties; if(properties.getPropertyAsInt("IceBox.InheritProperties") > 0) { - serviceProperties = Ice.Util.createProperties(serviceArgs, properties); + // + // Inherit all except Ice.Admin.Endpoints! + // + serviceProperties = properties._clone(); + serviceProperties.setProperty("Ice.Admin.Endpoints", ""); + serviceProperties = Ice.Util.createProperties(serviceArgs, serviceProperties); } else { |