Addressed comments.

tdas · tdas · commit c7c0b99a2373 · 2015-03-16T12:16:23.000-07:00
diff --git a/streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala b/streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala
@@ -47,9 +47,9 @@ class Checkpoint(@transient ssc: StreamingContext, val checkpointTime: Time)
     val newSparkConf = new SparkConf(loadDefaults = false).setAll(sparkConfPairs)
       .remove("spark.driver.host")
       .remove("spark.driver.port")
-    new SparkConf(loadDefaults = true).getOption("spark.master") match {
-      case Some(newMaster) => newSparkConf.setMaster(newMaster)
-      case _ => None
+    val oldMaster = new SparkConf(loadDefaults = true).getOption("spark.master")
+    oldMaster.foreach { newMaster =>
+      newSparkConf.setMaster(newMaster)
     }
     newSparkConf
   }

Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,9 @@ class Checkpoint(@transient ssc: StreamingContext, val checkpointTime: Time)`
`47`	`47`	`val newSparkConf = new SparkConf(loadDefaults = false).setAll(sparkConfPairs)`
`48`	`48`	`.remove("spark.driver.host")`
`49`	`49`	`.remove("spark.driver.port")`
`50`		`- new SparkConf(loadDefaults = true).getOption("spark.master") match {`
`51`		`- case Some(newMaster) => newSparkConf.setMaster(newMaster)`
`52`		`- case _ => None`
	`50`	`+ val oldMaster = new SparkConf(loadDefaults = true).getOption("spark.master")`
	`51`	`+ oldMaster.foreach { newMaster =>`
	`52`	`+ newSparkConf.setMaster(newMaster)`
`53`	`53`	`}`
`54`	`54`	`newSparkConf`
`55`	`55`	`}`