From d618f91c6d7ccdc07295d553bece3bc979393105 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 5 Dec 2016 14:06:38 -0500
Subject: [PATCH] Replace var with AtomicReference

---
 .../scala/sbt/internal/client/NetworkClient.scala    | 12 ++++++------
 .../scala/sbt/internal/client/ServerConnection.scala |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
index 1ee665764..934eeeeba 100644
--- a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
+++ b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
@@ -8,10 +8,10 @@ package client
 import java.net.{ URI, Socket, InetAddress, SocketException }
 import sbt.protocol._
 import sbt.internal.util.JLine
-import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.{ AtomicBoolean, AtomicReference }
 
 class NetworkClient(arguments: List[String]) {
-  private var status: String = "Ready"
+  private val status = new AtomicReference("Ready")
   private val lock: AnyRef = new AnyRef {}
   private val running = new AtomicBoolean(true)
   def usageError = sys.error("Expecting: sbt client 127.0.0.1:port")
@@ -41,12 +41,12 @@ class NetworkClient(arguments: List[String]) {
         event match {
           case e: StatusEvent =>
             lock.synchronized {
-              status = e.status
+              status.set(e.status)
             }
             println(event)
           case e => println(e.toString)
         }
-      override def onShutdown: Unit =
+      override def onShutdown(): Unit =
         {
           running.set(false)
         }
@@ -64,7 +64,7 @@ class NetworkClient(arguments: List[String]) {
             publishCommand(ExecCommand(s))
           case _ => //
         }
-        while (status != "Ready") {
+        while (status.get != "Ready") {
           Thread.sleep(100)
         }
       }
@@ -81,7 +81,7 @@ class NetworkClient(arguments: List[String]) {
         // toDel += client
       }
       lock.synchronized {
-        status = "Processing"
+        status.set("Processing")
       }
     }
 }
diff --git a/main-command/src/main/scala/sbt/internal/client/ServerConnection.scala b/main-command/src/main/scala/sbt/internal/client/ServerConnection.scala
index 21fc72a12..348761235 100644
--- a/main-command/src/main/scala/sbt/internal/client/ServerConnection.scala
+++ b/main-command/src/main/scala/sbt/internal/client/ServerConnection.scala
@@ -61,7 +61,7 @@ abstract class ServerConnection(connection: Socket) {
 
   def onEvent(event: EventMessage): Unit
 
-  def onShutdown: Unit
+  def onShutdown(): Unit
 
   def shutdown(): Unit = {
     println("Shutting down client connection")