diff options
| author | Hung Lin <hung.lin@gmail.com> | 2015-04-02 14:01:43 -0700 |
|---|---|---|
| committer | Josh Rosen <joshrosen@databricks.com> | 2015-04-02 14:16:45 -0700 |
| commit | 8fa09a480848faf4eda263cc1e79e0dd56a52605 (patch) | |
| tree | 345a33da40f65d607b79c9082a750d1b130701dc /network | |
| parent | a73055f7f9104cb5a9ed43a6cd4a82d463702b60 (diff) | |
| download | spark-8fa09a480848faf4eda263cc1e79e0dd56a52605.tar.gz spark-8fa09a480848faf4eda263cc1e79e0dd56a52605.tar.bz2 spark-8fa09a480848faf4eda263cc1e79e0dd56a52605.zip | |
SPARK-6414: Spark driver failed with NPE on job cancelation
Use Option for ActiveJob.properties to avoid NPE bug
Author: Hung Lin <hung.lin@gmail.com>
Closes #5124 from hunglin/SPARK-6414 and squashes the following commits:
2290b6b [Hung Lin] [SPARK-6414][core] Fix NPE in SparkContext.cancelJobGroup()
(cherry picked from commit e3202aa2e9bd140effbcf2a7a02b90cb077e760b)
Signed-off-by: Josh Rosen <joshrosen@databricks.com>
Conflicts:
core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala
Conflicts:
core/src/test/scala/org/apache/spark/SparkContextSuite.scala
Diffstat (limited to 'network')
0 files changed, 0 insertions, 0 deletions