[CORE] SPARK-6880: Fixed null check when all the dependent stages are…

… cancelled due to previous stage failure
mbautin · Apr 13, 2015 · 4575720 · 4575720
1 parent c5b0b29
commit 4575720
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala b/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala
@@ -818,13 +818,12 @@ class DAGScheduler(
       }
     }
 
-    val properties = if (jobIdToActiveJob.contains(jobId)) {
-      jobIdToActiveJob(stage.jobId).properties
-    } else {
-      // this stage will be assigned to "default" pool
-      null
+    val activeJob = jobIdToActiveJob.get(stage.jobId).getOrElse(null)
+    val properties = if (activeJob != null) { 
+        activeJob.properties 
+    } else { 
+        null
     }
-
     runningStages += stage
     // SparkListenerStageSubmitted should be posted before testing whether tasks are
     // serializable. If tasks are not serializable, a SparkListenerStageCompleted event