From 1a122986a1474dcc7c0a1698f4d02e737d0a92b9 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 30 Jan 2012 10:08:10 +0100 Subject: [PATCH] I really dislike final var --- akka-actor/src/main/scala/akka/actor/ActorCell.scala | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala index 5aaf4ae8d5..b9f0d70d43 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala @@ -209,10 +209,10 @@ private[akka] class ActorCell( /** * In milliseconds */ - final var receiveTimeoutData: (Long, Cancellable) = + var receiveTimeoutData: (Long, Cancellable) = if (_receiveTimeout.isDefined) (_receiveTimeout.get.toMillis, emptyCancellable) else emptyReceiveTimeoutData - final var childrenRefs: TreeMap[String, ChildRestartStats] = emptyChildrenRefs + var childrenRefs: TreeMap[String, ChildRestartStats] = emptyChildrenRefs private def _actorOf(props: Props, name: String): ActorRef = { if (system.settings.SerializeAllCreators && !props.creator.isInstanceOf[NoSerializationVerificationNeeded]) { @@ -255,16 +255,16 @@ private[akka] class ActorCell( a.stop() } - final var currentMessage: Envelope = null + var currentMessage: Envelope = null - final var actor: Actor = _ + var actor: Actor = _ - final var stopping = false + var stopping = false @volatile //This must be volatile since it isn't protected by the mailbox status var mailbox: Mailbox = _ - final var nextNameSequence: Long = 0 + var nextNameSequence: Long = 0 //Not thread safe, so should only be used inside the actor that inhabits this ActorCell final protected def randomName(): String = {