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

unbreak the akka-actor-nightly build

Browse source
This commit is contained in:
Roland 2012-09-07 16:56:42 +02:00
parent 397006918a
commit 79c9cdd98e
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-actor/src/main/scala/akka/actor/FSM.scala
View file

@ -597,7 +597,7 @@ trait FSM[S, D] extends Listeners with ActorLogging {
val timeout = if (currentState.timeout.isDefined) currentState.timeout else stateTimeouts(currentState.stateName)
if (timeout.isDefined) {
val t = timeout.get
if (t.finite_? && t.length >= 0) {
if (t.isFinite && t.length >= 0) {
import context.dispatcher
timeoutFuture = Some(context.system.scheduler.scheduleOnce(t, self, TimeoutMarker(generation)))
}

2
akka-testkit/src/main/scala/akka/testkit/TestKit.scala
View file

@ -568,7 +568,7 @@ trait TestKitBase {
val message =
if (max == 0.seconds) {
queue.pollFirst
} else if (max.finite_?) {
} else if (max.isFinite) {
queue.pollFirst(max.length, max.unit)
} else {
queue.takeFirst