fix type mismatch

WangTaoTheTonic · WangTaoTheTonic · commit 836b9ef13ef4 · 2015-01-12T12:13:35.000+08:00
diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala
@@ -151,7 +151,7 @@ private[spark] class SparkSubmitArguments(args: Seq[String], env: Map[String, St
 
     // In yarn mode, app name can be set via SPARK_YARN_APP_NAME
     if (master.contains("yarn")) {
-      name = Option(name).orElse(env.get("SPARK_YARN_APP_NAME"))
+      name = Option(name).orElse(env.get("SPARK_YARN_APP_NAME")).orNull
     }
     // Set name from main class if not given
     name = Option(name).orElse(Option(mainClass)).orNull

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ private[spark] class SparkSubmitArguments(args: Seq[String], env: Map[String, St`
`151`	`151`
`152`	`152`	`// In yarn mode, app name can be set via SPARK_YARN_APP_NAME`
`153`	`153`	`if (master.contains("yarn")) {`
`154`		`- name = Option(name).orElse(env.get("SPARK_YARN_APP_NAME"))`
	`154`	`+ name = Option(name).orElse(env.get("SPARK_YARN_APP_NAME")).orNull`
`155`	`155`	`}`
`156`	`156`	`// Set name from main class if not given`
`157`	`157`	`name = Option(name).orElse(Option(mainClass)).orNull`