From cd4927dd0482c66f1c05909ba659065b377aef5d Mon Sep 17 00:00:00 2001 From: Roland Date: Mon, 17 Sep 2012 21:24:28 +0200 Subject: [PATCH 01/27] make TestKitBase.testActor strict, see #2514 --- akka-testkit/src/main/scala/akka/testkit/TestKit.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala index a1721d2ffe..0b5944215a 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala @@ -49,6 +49,9 @@ object TestActor { } val FALSE = (x: Any) ⇒ false + + // make creator serializable, for VerifySerializabilitySpec + def props(queue: BlockingDeque[Message]): Props = Props(new TestActor(queue)) } class TestActor(queue: BlockingDeque[TestActor.Message]) extends Actor { @@ -112,9 +115,9 @@ trait TestKitBase { * ActorRef of the test actor. Access is provided to enable e.g. * registration as message target. */ - lazy val testActor: ActorRef = { + val testActor: ActorRef = { val impl = system.asInstanceOf[ActorSystemImpl] //TODO ticket #1559 - val ref = impl.systemActorOf(Props(new TestActor(queue)) + val ref = impl.systemActorOf(TestActor.props(queue) .withDispatcher(CallingThreadDispatcher.Id), "testActor" + TestKit.testActorId.incrementAndGet) awaitCond(ref match { From 8a8b32d0eb086e1df5fd12a598317db577b94aa6 Mon Sep 17 00:00:00 2001 From: Roland Date: Mon, 17 Sep 2012 21:25:41 +0200 Subject: [PATCH 02/27] various documentation patches, found at the bottom of my inbox --- .../src/main/scala/akka/actor/ActorCell.scala | 2 +- akka-docs/_sphinx/themes/akka/layout.html | 5 +- akka-docs/general/message-send-semantics.rst | 47 +++++++++++++++++++ akka-docs/general/supervision.rst | 22 ++++----- akka-docs/java/remoting.rst | 10 ++++ akka-docs/java/testing.rst | 17 +++++-- akka-docs/scala/remoting.rst | 10 ++++ akka-docs/scala/testing.rst | 17 +++++-- 8 files changed, 109 insertions(+), 21 deletions(-) diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala index c34b9ac05e..a89b5c8527 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala @@ -502,7 +502,7 @@ private[akka] class ActorCell( if (success) true else { val parent: Class[_] = clazz.getSuperclass - if (parent eq null) throw new IllegalActorStateException(toString + " is not an Actor since it have not mixed in the 'Actor' trait") + if (parent eq null) throw new IllegalActorStateException(actorInstance.getClass + " is not an Actor since it have not mixed in the 'Actor' trait") lookupAndSetField(parent, actor, name, value) } } diff --git a/akka-docs/_sphinx/themes/akka/layout.html b/akka-docs/_sphinx/themes/akka/layout.html index 5abad17ee3..426a289876 100644 --- a/akka-docs/_sphinx/themes/akka/layout.html +++ b/akka-docs/_sphinx/themes/akka/layout.html @@ -48,6 +48,7 @@