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

Fixed race in Future.await, and minor changes to Future.result and Future.exception

Browse source
This commit is contained in:
Derek Williams 2011-08-06 13:32:03 -06:00
parent 8a1d31691c
commit bc1f7565b7
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
akka-actor/src/main/scala/akka/dispatch/Future.scala
View file

@ -407,16 +407,16 @@ sealed trait Future[+T] extends japi.Future[T] {
* Returns the successful result of this Future if it exists.
*/
final def result: Option[T] = value match {
case Some(r) ⇒ r.right.toOption
case _ ⇒ None
case Some(Right(r)) ⇒ Some(r)
case _ ⇒ None
}
/**
* Returns the contained exception of this Future if it exists.
*/
final def exception: Option[Throwable] = value match {
case Some(r) ⇒ r.left.toOption
case _ ⇒ None
case Some(Left(e)) ⇒ Some(e)
case _ ⇒ None
}
/**
@ -740,7 +740,7 @@ class DefaultPromise[T](val timeout: Timeout)(implicit val dispatcher: MessageDi
val ms = NANOS.toMillis(waitTimeNanos)
val ns = (waitTimeNanos % 1000000l).toInt //As per object.wait spec
val start = currentTimeInNanos
try { ref.synchronized { ref.wait(ms, ns) } } catch { case e: InterruptedException ⇒ }
try { ref.synchronized { if (value.isEmpty) ref.wait(ms, ns) } } catch { case e: InterruptedException ⇒ }
awaitUnsafe(waitTimeNanos - (currentTimeInNanos - start))
} else {