Fix possible null pointer in acumulator toString

marmbrus · rxin · commit d3dbaf5a788a · 2014-06-24T19:39:31.000-07:00
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 (cherry picked from commit 2714968) Signed-off-by: Reynold Xin <rxin@apache.org>
diff --git 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
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ class Accumulable[R, T] (`
`127`	`127`	`Accumulators.register(this, false)`
`128`	`128`	`}`
`129`	`129`
`130`		`- override def toString = value_.toString`
	`130`	`+ override def toString = if (value_ == null) "null" else value_.toString`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`/**`