From 2c053a1d8976f9505c8d0247e520303bcd1d7e25 Mon Sep 17 00:00:00 2001 From: WangTaoTheTonic Date: Fri, 29 May 2015 17:45:02 +0800 Subject: [PATCH 1/3] Do trim to values in properties file --- .../org/apache/spark/launcher/AbstractCommandBuilder.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java index 33fd813f7a86..de2b175608b1 100644 --- a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java +++ b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java @@ -295,7 +295,11 @@ Properties loadPropertiesFile() throws IOException { FileInputStream fd = null; try { fd = new FileInputStream(propsFile); - props.load(new InputStreamReader(fd, "UTF-8")); + Properties rawProps = new Properties(); + rawProps.load(new InputStreamReader(fd, "UTF-8")); + for (String str : rawProps.stringPropertyNames()) { + props.setProperty(str, rawProps.getProperty(str).trim()); + } } finally { if (fd != null) { try { From 6dd1cf2f6caef44f5c76aa537532e234031d9754 Mon Sep 17 00:00:00 2001 From: WangTaoTheTonic Date: Sat, 30 May 2015 00:12:05 +0800 Subject: [PATCH 2/3] use a simpler way --- .../org/apache/spark/launcher/AbstractCommandBuilder.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java index de2b175608b1..cd0584a99c80 100644 --- a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java +++ b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java @@ -295,10 +295,9 @@ Properties loadPropertiesFile() throws IOException { FileInputStream fd = null; try { fd = new FileInputStream(propsFile); - Properties rawProps = new Properties(); - rawProps.load(new InputStreamReader(fd, "UTF-8")); - for (String str : rawProps.stringPropertyNames()) { - props.setProperty(str, rawProps.getProperty(str).trim()); + props.load(new InputStreamReader(fd, "UTF-8")); + for (Map.Entry e : props.entrySet()) { + e.setValue(e.getValue().toString().trim()); } } finally { if (fd != null) { From bb41b4b6796d1fafce78d23e26c40da249ac3ac5 Mon Sep 17 00:00:00 2001 From: Tao Wang Date: Sat, 30 May 2015 00:16:12 +0800 Subject: [PATCH 3/3] indent 4 to 2 --- .../java/org/apache/spark/launcher/AbstractCommandBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java index cd0584a99c80..33d65d13f0d2 100644 --- a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java +++ b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java @@ -297,7 +297,7 @@ Properties loadPropertiesFile() throws IOException { fd = new FileInputStream(propsFile); props.load(new InputStreamReader(fd, "UTF-8")); for (Map.Entry e : props.entrySet()) { - e.setValue(e.getValue().toString().trim()); + e.setValue(e.getValue().toString().trim()); } } finally { if (fd != null) {