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 /java/src/IceBox/ServiceManagerI.java | |
| 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 '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 { |