raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Renaming CompletableFuture to Promise, Renaming AlreadyCompletedFuture to KeptPromise, closing ticket #854

Browse source
This commit is contained in:
Viktor Klang 2011-05-23 11:31:01 +02:00
parent aa52486fdc
commit 8a790b1ddf
15 changed files with 74 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

6
akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
View file

@ -19,7 +19,7 @@ import akka.actor._
final case class MessageInvocation(receiver: ActorRef,
message: Any,
sender: Option[ActorRef],
senderFuture: Option[CompletableFuture[Any]]) {
senderFuture: Option[Promise[Any]]) {
if (receiver eq null) throw new IllegalArgumentException("Receiver can't be null")
def invoke() {
@ -32,7 +32,7 @@ final case class MessageInvocation(receiver: ActorRef,
}
}
final case class FutureInvocation[T](future: CompletableFuture[T], function: () ⇒ T, cleanup: () ⇒ Unit) extends Runnable {
final case class FutureInvocation[T](future: Promise[T], function: () ⇒ T, cleanup: () ⇒ Unit) extends Runnable {
def run() {
future complete (try {
Right(function())
@ -99,7 +99,7 @@ trait MessageDispatcher {
private[akka] final def dispatchFuture[T](block: () ⇒ T, timeout: Long): Future[T] = {
futures.getAndIncrement()
try {
val future = new DefaultCompletableFuture[T](timeout)
val future = new DefaultPromise[T](timeout)
if (active.isOff)
guard withGuard {