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

Minor cleanup in Future.scala

Browse source
This commit is contained in:
Viktor Klang 2011-08-01 12:52:18 +02:00
parent 824d202b4a
commit 088e2029a6
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -869,8 +869,8 @@ class DefaultPromise[T](val timeout: Timeout) extends Promise[T] {
this
} else { //Limited wait
val time = if (!atMost.isFinite) timeLeft() //If atMost is infinity, use preset timeout
else if (!timeout.duration.isFinite) atMost.toNanos //If preset timeout is infinite, use atMost
else atMost.toNanos min timeLeft() //Otherwise use the smallest of them
else if (!timeout.duration.isFinite) atMost.toNanos //If preset timeout is infinite, use atMost
else atMost.toNanos min timeLeft() //Otherwise use the smallest of them
if (awaitUnsafe(time)) this
else throw new FutureTimeoutException("Future timed out after [" + NANOS.toMillis(time) + "] ms")
}
@ -1002,7 +1002,7 @@ class DefaultPromise[T](val timeout: Timeout) extends Promise[T] {
try {
func(this)
} catch {
case e ⇒ EventHandler notify EventHandler.Error(e, this)
case e ⇒ EventHandler.error(e, this, "Future onComplete-callback raised an exception")
}
}