diff options
| author | Jeff Zhang <zjffdu@apache.org> | 2015-10-15 09:49:19 -0700 |
|---|---|---|
| committer | Marcelo Vanzin <vanzin@cloudera.com> | 2015-10-15 09:50:00 -0700 |
| commit | aec4400beffc569c13cceea2d0c481dfa3f34175 (patch) | |
| tree | c1f47f5aa8cac4a42754c9f1862184327d56e144 /launcher/src/main | |
| parent | 0f62c2282bb30cb4fb6eea9d28b198d557a79b22 (diff) | |
| download | spark-aec4400beffc569c13cceea2d0c481dfa3f34175.tar.gz spark-aec4400beffc569c13cceea2d0c481dfa3f34175.tar.bz2 spark-aec4400beffc569c13cceea2d0c481dfa3f34175.zip | |
[SPARK-11099] [SPARK SHELL] [SPARK SUBMIT] Default conf property file i…
Please help review it. Thanks
Author: Jeff Zhang <zjffdu@apache.org>
Closes #9114 from zjffdu/SPARK-11099.
Diffstat (limited to 'launcher/src/main')
| -rw-r--r-- | launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java | 14 |
1 files changed, 5 insertions, 9 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 cf3729b7fe..3ee6bd92e4 100644 --- a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java +++ b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java @@ -272,15 +272,11 @@ abstract class AbstractCommandBuilder { Map<String, String> getEffectiveConfig() throws IOException { if (effectiveConfig == null) { - if (propertiesFile == null) { - effectiveConfig = conf; - } else { - effectiveConfig = new HashMap<>(conf); - Properties p = loadPropertiesFile(); - for (String key : p.stringPropertyNames()) { - if (!effectiveConfig.containsKey(key)) { - effectiveConfig.put(key, p.getProperty(key)); - } + effectiveConfig = new HashMap<>(conf); + Properties p = loadPropertiesFile(); + for (String key : p.stringPropertyNames()) { + if (!effectiveConfig.containsKey(key)) { + effectiveConfig.put(key, p.getProperty(key)); } } } |