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

Merge branch 'master' of github.com:jboner/akka

Browse source
This commit is contained in:
Viktor Klang 2011-11-11 12:59:35 +01:00
commit 7ec510fbd6
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala
View file

@ -181,12 +181,11 @@ object FSMTimingSpec {
}
when(TestCancelTimer) {
case Ev(Tick) ⇒
tester ! Tick
setTimer("hallo", Tock, 1 milli, false)
TestKit.awaitCond(context.hasMessages, 1 second)
cancelTimer("hallo")
setTimer("hallo", Tock, 500 millis, false)
stay
stay replying Tick
case Ev(Tock) ⇒
tester ! Tock
stay

2
akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala
View file

@ -329,8 +329,6 @@ class ActorPoolSpec extends AkkaSpec {
}
"support typed actors" in {
import RoutingSpec._
val pool = app.createProxy[Foo](new Actor with DefaultActorPool with BoundedCapacityStrategy with MailboxPressureCapacitor with SmallestMailboxSelector with Filter with RunningMeanBackoff with BasicRampup {
def lowerBound = 1
def upperBound = 5

5
akka-actor/src/main/scala/akka/actor/ActorSystem.scala
View file

@ -91,7 +91,10 @@ class ActorSystem(val name: String, val config: Configuration) extends ActorRefF
val ActorTimeoutMillis = ActorTimeout.duration.toMillis
val SerializeAllMessages = getBool("akka.actor.serialize-messages", false)
val TestTimeFactor = getDouble("akka.test.timefactor", 1.0)
val TestTimeFactor =
try java.lang.Double.parseDouble(System.getProperty("akka.test.timefactor")) catch {
case _: Exception ⇒ getDouble("akka.test.timefactor", 1.0)
}
val TestEventFilterLeeway = Duration(getDouble("akka.test.filter-leeway", 0.5), DefaultTimeUnit)
val LogLevel = getString("akka.loglevel", "INFO")

2
akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
View file

@ -205,7 +205,7 @@ abstract class Mailbox(val actor: ActorCell) extends AbstractMailbox with Messag
}
} catch {
case e ⇒
actor.app.eventStream.publish(Error(e, this, "exception during processing system messages, dropping " + SystemMessage.size(nextMessage) + " messages!"))
actor.app.eventStream.publish(Error(e, actor.self, "exception during processing system messages, dropping " + SystemMessage.size(nextMessage) + " messages!"))
throw e
}
}