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

make Terminated constr private[akka]

Browse source
This commit is contained in:
Roland 2012-08-20 11:22:52 +02:00
parent 8827536cc2
commit c03665ec46
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -63,7 +63,7 @@ case object Kill extends Kill {
* When Death Watch is used, the watcher will receive a Terminated(watched) message when watched is terminated. * When Death Watch is used, the watcher will receive a Terminated(watched) message when watched is terminated.
*/ */
@SerialVersionUID(1L) @SerialVersionUID(1L)
case class Terminated(@BeanProperty actor: ActorRef)( case class Terminated private[akka] (@BeanProperty actor: ActorRef)(
@BeanProperty val existenceConfirmed: Boolean, @BeanProperty val existenceConfirmed: Boolean,
private[akka] val uid: Int) private[akka] val uid: Int)
extends AutoReceivedMessage extends AutoReceivedMessage

4
akka-docs/java/code/docs/actor/FaultHandlingTestBase.java
View file

@ -182,7 +182,7 @@ public class FaultHandlingTestBase {
final TestProbe probe = new TestProbe(system); final TestProbe probe = new TestProbe(system);
probe.watch(child); probe.watch(child);
child.tell(new IllegalArgumentException()); child.tell(new IllegalArgumentException());
probe.expectMsg(new Terminated(child, true, 0)); probe.expectMsgClass(Terminated.class);
//#stop //#stop
//#escalate-kill //#escalate-kill
@ -190,7 +190,7 @@ public class FaultHandlingTestBase {
probe.watch(child); probe.watch(child);
assert Await.result(ask(child, "get", 5000), timeout).equals(0); assert Await.result(ask(child, "get", 5000), timeout).equals(0);
child.tell(new Exception()); child.tell(new Exception());
probe.expectMsg(new Terminated(child, true, 0)); probe.expectMsgClass(Terminated.class);
//#escalate-kill //#escalate-kill
//#escalate-restart //#escalate-restart

10
akka-docs/scala/code/docs/actor/FaultHandlingDocSpec.scala
View file

@ -113,8 +113,9 @@ class FaultHandlingDocSpec extends AkkaSpec with ImplicitSender {
//#stop //#stop
watch(child) // have testActor watch “child” watch(child) // have testActor watch “child”
child ! new IllegalArgumentException // break it child ! new IllegalArgumentException // break it
val t = expectMsg(Terminated(child)(true, 0)) expectMsgPF() {
t.existenceConfirmed must be(true) case t @ Terminated(`child`) if t.existenceConfirmed ⇒ ()
}
child.isTerminated must be(true) child.isTerminated must be(true)
//#stop //#stop
} }
@ -128,8 +129,9 @@ class FaultHandlingDocSpec extends AkkaSpec with ImplicitSender {
expectMsg(0) expectMsg(0)
child2 ! new Exception("CRASH") // escalate failure child2 ! new Exception("CRASH") // escalate failure
val t = expectMsg(Terminated(child2)(true, 0)) expectMsgPF() {
t.existenceConfirmed must be(true) case t @ Terminated(`child2`) if t.existenceConfirmed ⇒ ()
}
//#escalate-kill //#escalate-kill
//#escalate-restart //#escalate-restart
val supervisor2 = system.actorOf(Props[Supervisor2], "supervisor2") val supervisor2 = system.actorOf(Props[Supervisor2], "supervisor2")