From b1bbbe699cd23b937e6fa5c90d5ea0fcc9801681 Mon Sep 17 00:00:00 2001 From: Christopher Nguyen <ctn@adatao.com> Date: Mon, 5 Aug 2013 17:22:27 -0700 Subject: [PATCH] [HOTFIX] Mark lastSetSparkEnv @volatile in case it gets HotSpot-cached On branch adatao-global-SparkEnv Changes to be committed: modified: core/src/main/scala/spark/SparkEnv.scala --- core/src/main/scala/spark/SparkEnv.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/spark/SparkEnv.scala b/core/src/main/scala/spark/SparkEnv.scala index 9ac59918cc..0adbf1d96e 100644 --- a/core/src/main/scala/spark/SparkEnv.scala +++ b/core/src/main/scala/spark/SparkEnv.scala @@ -97,7 +97,7 @@ class SparkEnv ( object SparkEnv extends Logging { private val env = new ThreadLocal[SparkEnv] - private var lastSetSparkEnv : SparkEnv = _ + @volatile private var lastSetSparkEnv : SparkEnv = _ def set(e: SparkEnv) { lastSetSparkEnv = e -- GitLab