Don't use job.properties when null

alteryx · Apr 23, 2014 · e52b829 · e52b829
1 parent 82f78bb
commit e52b829
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala b/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala
@@ -1056,7 +1056,8 @@ class DAGScheduler(
     job.listener.jobFailed(error)
 
     val shouldInterruptThread =
-      job.properties.getProperty(SparkContext.SPARK_JOB_INTERRUPT_ON_CANCEL, "false").toBoolean
+      if (job.properties == null) false
+      else job.properties.getProperty(SparkContext.SPARK_JOB_INTERRUPT_ON_CANCEL, "false").toBoolean
 
     // Cancel all independent, running stages.
     val stages = jobIdToStageIds(job.jobId)