Change sender and senderfuture to Either

2010-04-06 22:37:34 +02:00 · 2010-04-06 22:37:34 +02:00 · 2593fd3ab3
commit 2593fd3ab3
parent 784ca9e750
9 changed files with 49 additions and 66 deletions
--- a/akka-core/src/main/scala/stm/DataFlowVariable.scala
+++ b/akka-core/src/main/scala/stm/DataFlowVariable.scala
@ -84,8 +84,14 @@ import se.scalablesolutions.akka.dispatch.CompletableFuture
      def receive = {
        case Get =>
          val ref = dataFlow.value.get
-          if (ref.isDefined) reply(ref.get)
-          else readerFuture = senderFuture
+          if (ref.isDefined)
+            reply(ref.get)
+          else {
+            readerFuture = replyTo match { 
+              case Some(Right(future)) => Some(future)
+              case _ => None
+            }
+          }
        case Set(v) => if (readerFuture.isDefined) readerFuture.get.completeWithResult(v)
        case Exit =>  exit
      }