Respect spark.master before MASTER in REPL

andrewor14 · andrewor14 · commit 2cb81c9ed313 · 2014-05-21T11:43:36.000-07:00
diff --git a/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala b/repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala
@@ -962,11 +962,10 @@ class SparkILoop(in0: Option[BufferedReader], protected val out: JPrintWriter,
   private def getMaster(): String = {
     val master = this.master match {
       case Some(m) => m
-      case None => {
+      case None =>
         val envMaster = sys.env.get("MASTER")
         val propMaster = sys.props.get("spark.master")
-        envMaster.orElse(propMaster).getOrElse("local[*]")
-      }
+        propMaster.orElse(envMaster).getOrElse("local[*]")
     }
     master
   }

Original file line number	Diff line number	Diff line change
`@@ -962,11 +962,10 @@ class SparkILoop(in0: Option[BufferedReader], protected val out: JPrintWriter,`
`962`	`962`	`private def getMaster(): String = {`
`963`	`963`	`val master = this.master match {`
`964`	`964`	`case Some(m) => m`
`965`		`- case None => {`
	`965`	`+ case None =>`
`966`	`966`	`val envMaster = sys.env.get("MASTER")`
`967`	`967`	`val propMaster = sys.props.get("spark.master")`
`968`		`- envMaster.orElse(propMaster).getOrElse("local[*]")`
`969`		`- }`
	`968`	`+ propMaster.orElse(envMaster).getOrElse("local[*]")`
`970`	`969`	`}`
`971`	`970`	`master`
`972`	`971`	`}`