Use volatile instead of Atomic things in unit tests

apache · Jan 14, 2015 · 460f7b3 · 460f7b3
1 parent 227bf33
commit 460f7b3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/core/src/main/scala/org/apache/spark/util/EventLoop.scala b/core/src/main/scala/org/apache/spark/util/EventLoop.scala
@@ -74,7 +74,7 @@ private[spark] abstract class EventLoop[E](name: String) extends Logging {
   }
 
   def stop(): Unit = {
-    if (stopped.compareAndSet(false ,true)) {
+    if (stopped.compareAndSet(false, true)) {
       eventThread.interrupt()
       eventThread.join()
       // Call onStop after the event thread exits to make sure onReceive happens before onStop

diff --git a/core/src/test/scala/org/apache/spark/util/EventLoopSuite.scala b/core/src/test/scala/org/apache/spark/util/EventLoopSuite.scala
@@ -17,8 +17,6 @@
 
 package org.apache.spark.util
 
-import java.util.concurrent.atomic.AtomicReference
-
 import scala.collection.mutable
 import scala.concurrent.duration._
 import scala.language.postfixOps
@@ -62,43 +60,43 @@ class EventLoopSuite extends FunSuite {
 
   test("EventLoop: onError") {
     val e = new RuntimeException("Oops")
-    val receivedError = new AtomicReference[Throwable]()
+    @volatile var receivedError: Throwable = null
     val eventLoop = new EventLoop[Int]("test") {
 
       override def onReceive(event: Int): Unit = {
         throw e
       }
 
       override def onError(e: Throwable): Unit = {
-        receivedError.set(e)
+        receivedError = e
       }
     }
     eventLoop.start()
     eventLoop.post(1)
     eventually(timeout(5 seconds), interval(200 millis)) {
-      assert(e === receivedError.get)
+      assert(e === receivedError)
     }
     eventLoop.stop()
   }
 
   test("EventLoop: error thrown from onError should not crash the event thread") {
     val e = new RuntimeException("Oops")
-    val receivedError = new AtomicReference[Throwable]()
+    @volatile var receivedError: Throwable = null
     val eventLoop = new EventLoop[Int]("test") {
 
       override def onReceive(event: Int): Unit = {
         throw e
       }
 
       override def onError(e: Throwable): Unit = {
-        receivedError.set(e)
+        receivedError = e
         throw new RuntimeException("Oops")
       }
     }
     eventLoop.start()
     eventLoop.post(1)
     eventually(timeout(5 seconds), interval(200 millis)) {
-      assert(e === receivedError.get)
+      assert(e === receivedError)
       assert(eventLoop.isActive)
     }
     eventLoop.stop()
@@ -129,7 +127,7 @@ class EventLoopSuite extends FunSuite {
   }
 
   test("EventLoop: post event in multiple threads") {
-    var receivedEventsCount = 0
+    @volatile var receivedEventsCount = 0
     val eventLoop = new EventLoop[Int]("test") {
 
       override def onReceive(event: Int): Unit = {