diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/Ice/PropertiesI.java | 2 | ||||
| -rw-r--r-- | java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java | 4 | ||||
| -rw-r--r-- | java/test/Ice/properties/Client.java | 39 | ||||
| -rw-r--r-- | java/test/Ice/properties/config/config.1 | 1 | ||||
| -rw-r--r-- | java/test/Ice/properties/config/config.2 | 1 | ||||
| -rw-r--r-- | java/test/Ice/properties/config/config.3 | 1 |
6 files changed, 32 insertions, 16 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) { diff --git a/java/test/Ice/properties/Client.java b/java/test/Ice/properties/Client.java index 9c6e7abae47..77b69c3baea 100644 --- a/java/test/Ice/properties/Client.java +++ b/java/test/Ice/properties/Client.java @@ -37,19 +37,32 @@ public class Client extends test.Util.Application public int run(String[] args) { - System.out.print("testing load properties from UTF-8 path... "); - Ice.InitializationData id = new Ice.InitializationData(); - id.properties = Ice.Util.createProperties(); - id.properties.load(configPath); - test(id.properties.getProperty("Ice.Trace.Network").equals("1")); - test(id.properties.getProperty("Ice.Trace.Protocol").equals("1")); - test(id.properties.getProperty("Config.Path").equals(configPath)); - test(id.properties.getProperty("Ice.ProgramName").equals("PropertiesClient")); - System.out.println("ok"); - System.out.print("testing load properties from UTF-8 path using Ice::Application... "); - PropertiesClient c = new PropertiesClient(); - c.main("", args, configPath); - System.out.println("ok"); + { + System.out.print("testing load properties from UTF-8 path... "); + Ice.Properties properties = Ice.Util.createProperties(); + properties.load(configPath); + test(properties.getProperty("Ice.Trace.Network").equals("1")); + test(properties.getProperty("Ice.Trace.Protocol").equals("1")); + test(properties.getProperty("Config.Path").equals(configPath)); + test(properties.getProperty("Ice.ProgramName").equals("PropertiesClient")); + System.out.println("ok"); + System.out.print("testing load properties from UTF-8 path using Ice::Application... "); + PropertiesClient c = new PropertiesClient(); + c.main("", args, configPath); + System.out.println("ok"); + } + { + // + // Try to load multiple config files. + // + System.out.print("testing using Ice.Config with multiple config files... "); + String[] args1 = new String[]{"--Ice.Config=config/config.1, config/config.2, config/config.3"}; + Ice.Properties properties = Ice.Util.createProperties(args1); + test(properties.getProperty("Config1").equals("Config1")); + test(properties.getProperty("Config2").equals("Config2")); + test(properties.getProperty("Config3").equals("Config3")); + System.out.println("ok"); + } return 0; } diff --git a/java/test/Ice/properties/config/config.1 b/java/test/Ice/properties/config/config.1 new file mode 100644 index 00000000000..2a20653e4c5 --- /dev/null +++ b/java/test/Ice/properties/config/config.1 @@ -0,0 +1 @@ +Config1=Config1
\ No newline at end of file diff --git a/java/test/Ice/properties/config/config.2 b/java/test/Ice/properties/config/config.2 new file mode 100644 index 00000000000..be276df6602 --- /dev/null +++ b/java/test/Ice/properties/config/config.2 @@ -0,0 +1 @@ +Config2=Config2
\ No newline at end of file diff --git a/java/test/Ice/properties/config/config.3 b/java/test/Ice/properties/config/config.3 new file mode 100644 index 00000000000..55c1e1123f6 --- /dev/null +++ b/java/test/Ice/properties/config/config.3 @@ -0,0 +1 @@ +Config3=Config3
\ No newline at end of file |