Repository: spark Updated Branches: refs/heads/branch-1.6 bc3bfa04d -> d9a39048f
[SPARK-10192][HOTFIX] Fix NPE in test that was added in #8402 This fixes an NPE introduced in SPARK-10192 / #8402. Author: Josh Rosen <joshro...@databricks.com> Closes #9620 from JoshRosen/SPARK-10192-hotfix. (cherry picked from commit fac53d8ec015e27d034dfe30ed8ce7d83f07efa6) Signed-off-by: Josh Rosen <joshro...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d9a39048 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d9a39048 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d9a39048 Branch: refs/heads/branch-1.6 Commit: d9a39048f9d2ade54828a4b629cebcebd9f9350d Parents: bc3bfa0 Author: Josh Rosen <joshro...@databricks.com> Authored: Tue Nov 10 22:24:00 2015 -0800 Committer: Josh Rosen <joshro...@databricks.com> Committed: Tue Nov 10 22:24:23 2015 -0800 ---------------------------------------------------------------------- .../test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/d9a39048/core/src/test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala b/core/src/test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala index 068b49b..4d6b254 100644 --- a/core/src/test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala +++ b/core/src/test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala @@ -1070,7 +1070,7 @@ class DAGSchedulerSuite // Run the first job successfully, which creates one shuffle dependency val shuffleMapRdd = new MyRDD(sc, 2, Nil) - val shuffleDep = new ShuffleDependency(shuffleMapRdd, null) + val shuffleDep = new ShuffleDependency(shuffleMapRdd, new HashPartitioner(2)) val reduceRdd = new MyRDD(sc, 2, List(shuffleDep)) submit(reduceRdd, Array(0, 1)) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
