From 9ba6c293ed764ed990ec992cb8111bae295daa6f Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 26 Aug 2012 12:54:49 +0000 Subject: [PATCH] * DataHelper: Trim trailing whitespace when loading properties --- core/java/src/net/i2p/data/DataHelper.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java index 14f2d2f0b..2a6aca2bf 100644 --- a/core/java/src/net/i2p/data/DataHelper.java +++ b/core/java/src/net/i2p/data/DataHelper.java @@ -394,12 +394,21 @@ public class DataHelper { public static void loadProps(Properties props, File file) throws IOException { loadProps(props, file, false); } + + /** + * @param forceLowerCase if true forces the keys to lower case (not the values) + */ public static void loadProps(Properties props, File file, boolean forceLowerCase) throws IOException { loadProps(props, new FileInputStream(file), forceLowerCase); } + public static void loadProps(Properties props, InputStream inStr) throws IOException { loadProps(props, inStr, false); } + + /** + * @param forceLowerCase if true forces the keys to lower case (not the values) + */ public static void loadProps(Properties props, InputStream inStr, boolean forceLowerCase) throws IOException { BufferedReader in = null; try { @@ -414,7 +423,7 @@ public class DataHelper { int split = line.indexOf('='); if (split <= 0) continue; String key = line.substring(0, split); - String val = line.substring(split+1); //.trim() ?????????????? + String val = line.substring(split+1).trim(); // Unescape line breaks after loading. // Remember: "\" needs escaping both for regex and string.