Move a bracket in validateSettings of SparkConf

SaintBacchus · SaintBacchus · commit e717fb6a97a4 · 2014-08-18T18:20:31.000+08:00
diff --git a/core/src/main/scala/org/apache/spark/SparkConf.scala b/core/src/main/scala/org/apache/spark/SparkConf.scala
@@ -227,7 +227,7 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging {
     // Validate spark.executor.extraJavaOptions
     settings.get(executorOptsKey).map { javaOpts =>
       if (javaOpts.contains("-Dspark")) {
-        val msg = s"$executorOptsKey is not allowed to set Spark options (was '$javaOpts)'. " +
+        val msg = s"$executorOptsKey is not allowed to set Spark options (was '$javaOpts'). " +
           "Set them directly on a SparkConf or in a properties file when using ./bin/spark-submit."
         throw new Exception(msg)
       }

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging {`
`227`	`227`	`// Validate spark.executor.extraJavaOptions`
`228`	`228`	`settings.get(executorOptsKey).map { javaOpts =>`
`229`	`229`	`if (javaOpts.contains("-Dspark")) {`
`230`		`- val msg = s"$executorOptsKey is not allowed to set Spark options (was '$javaOpts)'. " +`
	`230`	`+ val msg = s"$executorOptsKey is not allowed to set Spark options (was '$javaOpts'). " +`
`231`	`231`	`"Set them directly on a SparkConf or in a properties file when using ./bin/spark-submit."`
`232`	`232`	`throw new Exception(msg)`
`233`	`233`	`}`