From 2714968e1b40221739c5dfba7ca4c0c06953dbe2 Mon Sep 17 00:00:00 2001
From: Michael Armbrust <michael@databricks.com>
Date: Tue, 24 Jun 2014 19:39:19 -0700
Subject: [PATCH] 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
---
core/src/main/scala/org/apache/spark/Accumulators.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
}
/**
--
GitLab