From d04f69a31cd7547bb8a554d78d0a6c709142c980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bon=C3=A9r?= Date: Fri, 28 May 2010 11:58:52 +0200 Subject: [PATCH] Fixed issue with AMQP module --- akka-amqp/src/main/scala/AMQP.scala | 2 +- akka-core/src/main/scala/actor/ActorRef.scala | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/akka-amqp/src/main/scala/AMQP.scala b/akka-amqp/src/main/scala/AMQP.scala index ae2df7dc40..04a22c2089 100644 --- a/akka-amqp/src/main/scala/AMQP.scala +++ b/akka-amqp/src/main/scala/AMQP.scala @@ -93,7 +93,7 @@ object AMQP { import scala.collection.JavaConversions._ - private val supervisor = actorOf[AMQPSupervisorActor].start + private val supervisor = actorOf(new AMQPSupervisorActor).start private val connections = new ConcurrentHashMap[ActorRef, ActorRef] def newProducer( diff --git a/akka-core/src/main/scala/actor/ActorRef.scala b/akka-core/src/main/scala/actor/ActorRef.scala index 15a2e3a385..42745c733f 100644 --- a/akka-core/src/main/scala/actor/ActorRef.scala +++ b/akka-core/src/main/scala/actor/ActorRef.scala @@ -206,16 +206,6 @@ trait ActorRef extends TransactionManagement { */ protected[akka] val dispatcherLock = new ReentrantLock - /** - * Holds the reference to the sender of the currently processed message. - * - Is None if no sender was specified - * - Is Some(Left(Actor)) if sender is an actor - * - Is Some(Right(CompletableFuture)) if sender is holding on to a Future for the result - */ -// protected[this] var _replyTo: Option[Either[ActorRef, CompletableFuture[Any]]] = None -// protected[akka] def replyTo: Option[Either[ActorRef, CompletableFuture[Any]]] = guard.withGuard { _replyTo } -// protected[akka] def replyTo_=(rt: Option[Either[ActorRef, CompletableFuture[Any]]]) = guard.withGuard { _replyTo = rt } - protected[akka] var _sender: Option[ActorRef] = None protected[akka] var _senderFuture: Option[CompletableFuture[Any]] = None protected[akka] def sender_=(s: Option[ActorRef]) = guard.withGuard { _sender = s}