Repository: spark Updated Branches: refs/heads/branch-1.0 e199a02dd -> d3dbaf5a7
Fix possible null pointer in acumulator toString Author: Michael Armbrust <mich...@databricks.com> Closes #1204 from marmbrus/nullPointerToString and squashes the following commits: 35b5fce [Michael Armbrust] Fix possible null pointer in acumulator toString (cherry picked from commit 2714968e1b40221739c5dfba7ca4c0c06953dbe2) Signed-off-by: Reynold Xin <r...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d3dbaf5a Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d3dbaf5a Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d3dbaf5a Branch: refs/heads/branch-1.0 Commit: d3dbaf5a788af77c3d253e7dc6ea7ce54fe6fbe0 Parents: e199a02 Author: Michael Armbrust <mich...@databricks.com> Authored: Tue Jun 24 19:39:19 2014 -0700 Committer: Reynold Xin <r...@apache.org> Committed: Tue Jun 24 19:39:31 2014 -0700 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/Accumulators.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/d3dbaf5a/core/src/main/scala/org/apache/spark/Accumulators.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/Accumulators.scala b/core/src/main/scala/org/apache/spark/Accumulators.scala index cdfd338..9c55bfb 100644 --- a/core/src/main/scala/org/apache/spark/Accumulators.scala +++ b/core/src/main/scala/org/apache/spark/Accumulators.scala @@ -127,7 +127,7 @@ class Accumulable[R, T] ( Accumulators.register(this, false) } - override def toString = value_.toString + override def toString = if (value_ == null) "null" else value_.toString } /**
