From 6f75784c657d64acf4d9de37f15687bf5541f165 Mon Sep 17 00:00:00 2001 From: Andrew Or Date: Wed, 29 Apr 2015 11:05:47 -0700 Subject: [PATCH] Revert "Guard against NPE if CC is used outside of an application" This reverts commit e909a4222a132b1fc4fff87a111ece7d32b82765. --- .../src/main/scala/org/apache/spark/util/ClosureCleaner.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/util/ClosureCleaner.scala b/core/src/main/scala/org/apache/spark/util/ClosureCleaner.scala index cb15c624140e5..9ea0da15f7947 100644 --- a/core/src/main/scala/org/apache/spark/util/ClosureCleaner.scala +++ b/core/src/main/scala/org/apache/spark/util/ClosureCleaner.scala @@ -310,9 +310,7 @@ private[spark] object ClosureCleaner extends Logging { private def ensureSerializable(func: AnyRef) { try { - if (SparkEnv.get != null) { - SparkEnv.get.closureSerializer.newInstance().serialize(func) - } + SparkEnv.get.closureSerializer.newInstance().serialize(func) } catch { case ex: Exception => throw new SparkException("Task not serializable", ex) }