diff options
| author | Michael Armbrust <michael@databricks.com> | 2014-06-24 19:39:19 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2014-06-24 19:39:19 -0700 |
| commit | 2714968e1b40221739c5dfba7ca4c0c06953dbe2 (patch) | |
| tree | ff73106d459f294e4a88e1d0c5e0ae4d957fd5da /core | |
| parent | 54055fb2b73a545e7cca6c645356ef287aa5a7c4 (diff) | |
| download | spark-2714968e1b40221739c5dfba7ca4c0c06953dbe2.tar.gz spark-2714968e1b40221739c5dfba7ca4c0c06953dbe2.tar.bz2 spark-2714968e1b40221739c5dfba7ca4c0c06953dbe2.zip | |
Fix possible null pointer in acumulator toString
Author: Michael Armbrust <michael@databricks.com>
Closes #1204 from marmbrus/nullPointerToString and squashes the following commits:
35b5fce [Michael Armbrust] Fix possible null pointer in acumulator toString
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/Accumulators.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/Accumulators.scala b/core/src/main/scala/org/apache/spark/Accumulators.scala index cdfd338081..9c55bfbb47 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 } /** |