summaryrefslogtreecommitdiff
path: root/java/src/Ice/PropertiesI.java
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2013-07-29 17:22:07 +0200
committerJose <jose@zeroc.com>2013-07-29 17:22:07 +0200
commit2f37792f3f90692b2aa5ec9cc3383c9e02f66c9c (patch)
treee2968ac4239e7e8182d4cc6fb2f458c95fbb384e /java/src/Ice/PropertiesI.java
parentremoving INSTALL files (diff)
downloadice-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/Ice/PropertiesI.java')
-rw-r--r--java/src/Ice/PropertiesI.java2
1 files changed, 1 insertions, 1 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());
}
}