diff options
| author | Jose <jose@zeroc.com> | 2013-07-29 17:22:07 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-07-29 17:22:07 +0200 |
| commit | 2f37792f3f90692b2aa5ec9cc3383c9e02f66c9c (patch) | |
| tree | e2968ac4239e7e8182d4cc6fb2f458c95fbb384e /java/src | |
| parent | removing INSTALL files (diff) | |
| download | ice-2f37792f3f90692b2aa5ec9cc3383c9e02f66c9c.tar.bz2 ice-2f37792f3f90692b2aa5ec9cc3383c9e02f66c9c.tar.xz ice-2f37792f3f90692b2aa5ec9cc3383c9e02f66c9c.zip | |
Fixed ICE-5393 - Java / C# load properties doesn't correctly parse Ice.Config with multiple files
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/PropertiesI.java | 2 | ||||
| -rw-r--r-- | java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/java/src/Ice/PropertiesI.java b/java/src/Ice/PropertiesI.java index 8bd82db059d..ee1b69c8ea3 100644 --- a/java/src/Ice/PropertiesI.java +++ b/java/src/Ice/PropertiesI.java @@ -741,7 +741,7 @@ public final class PropertiesI implements Properties { for(String file : value.split(",")) { - load(file); + load(file.trim()); } } diff --git a/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java b/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java index 8f29f38974e..4d06a155efe 100644 --- a/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java @@ -262,11 +262,11 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext String metricsDefs = coord.getProperties().getProperty("IceGridAdmin.MetricsConfigs"); if(!metricsDefs.isEmpty()) { - for(String s : IceUtilInternal.StringUtil.splitString(metricsDefs, ", \t\r\n")) + for(String s : metricsDefs.split(",")) { try { - _properties.load(s); + _properties.load(s.trim()); } catch(Ice.FileException ex) { |