Fixed ICE-5393 - Java / C# load properties doesn't correctly parse Ice.Config with multiple files

4 files changed, 17 insertions, 7 deletions

diff --git a/py/test/Ice/properties/Client.py b/py/test/Ice/properties/Client.py
index eed2d6e6511..d2b993b9cb9 100644
--- a/py/test/Ice/properties/Client.py
+++ b/py/test/Ice/properties/Client.py
@@ -29,13 +29,12 @@ class Client(Ice.Application):
 
 sys.stdout.write("testing load properties from UTF-8 path... ")
 sys.stdout.flush()
-id = Ice.InitializationData()
-id.properties = Ice.createProperties()
-id.properties.load("./config/中国_client.config")
-test(id.properties.getProperty("Ice.Trace.Network") == "1")
-test(id.properties.getProperty("Ice.Trace.Protocol") == "1")
-test(id.properties.getProperty("Config.Path") == "./config/中国_client.config")
-test(id.properties.getProperty("Ice.ProgramName") == "PropertiesClient")
+properties = Ice.createProperties()
+properties.load("./config/中国_client.config")
+test(properties.getProperty("Ice.Trace.Network") == "1")
+test(properties.getProperty("Ice.Trace.Protocol") == "1")
+test(properties.getProperty("Config.Path") == "./config/中国_client.config")
+test(properties.getProperty("Ice.ProgramName") == "PropertiesClient")
 print("ok")
 sys.stdout.write("testing load properties from UTF-8 path using Ice::Application... ")
 sys.stdout.flush()
@@ -43,4 +42,12 @@ c  = Client()
 c.main(sys.argv, "./config/中国_client.config")
 print("ok")
 
+sys.stdout.write("testing using Ice.Config with multiple config files... ")
+sys.stdout.flush()
+properties = Ice.createProperties(["--Ice.Config=config/config.1, config/config.2, config/config.3"]);
+test(properties.getProperty("Config1") == "Config1");
+test(properties.getProperty("Config2") == "Config2");
+test(properties.getProperty("Config3") == "Config3");
+print("ok")
+
 sys.exit(0)
diff --git a/py/test/Ice/properties/config/config.1 b/py/test/Ice/properties/config/config.1
new file mode 100644
index 00000000000..2a20653e4c5
--- /dev/null
+++ b/py/test/Ice/properties/config/config.1
@@ -0,0 +1 @@
+Config1=Config1
\ No newline at end of file
diff --git a/py/test/Ice/properties/config/config.2 b/py/test/Ice/properties/config/config.2
new file mode 100644
index 00000000000..be276df6602
--- /dev/null
+++ b/py/test/Ice/properties/config/config.2
@@ -0,0 +1 @@
+Config2=Config2
\ No newline at end of file
diff --git a/py/test/Ice/properties/config/config.3 b/py/test/Ice/properties/config/config.3
new file mode 100644
index 00000000000..55c1e1123f6
--- /dev/null
+++ b/py/test/Ice/properties/config/config.3
@@ -0,0 +1 @@
+Config3=Config3
\ No newline at end of file