From da517cee7f990bb9384059d6ff440df402b1da77 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 18 Jul 2012 16:51:57 +0200
Subject: [PATCH 1/2] Correcting lifted code examples for programmatic usage of
 Serializers in Java documentation of Serializers

---
 .../code/docs/serialization/SerializationDocTestBase.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/akka-docs/java/code/docs/serialization/SerializationDocTestBase.java b/akka-docs/java/code/docs/serialization/SerializationDocTestBase.java
index 5d27e4f37f..e30385e1d0 100644
--- a/akka-docs/java/code/docs/serialization/SerializationDocTestBase.java
+++ b/akka-docs/java/code/docs/serialization/SerializationDocTestBase.java
@@ -168,7 +168,7 @@ public class SerializationDocTestBase {
 
   @Test
   public void demonstrateTheProgrammaticAPI() {
-    // #programmatic
+    //#programmatic
     ActorSystem system = ActorSystem.create("example");
 
     // Get the Serialization Extension
@@ -190,7 +190,7 @@ public class SerializationDocTestBase {
     // Voilá!
     assertEquals(original, back);
 
-    // #programmatic
+    //#programmatic
     system.shutdown();
   }
 }

From 3856ec935789397769fc608468d77d07ea179c6e Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Fri, 20 Jul 2012 14:13:13 +0200
Subject: [PATCH 2/2] Adding additional router supervision test

---
 .../src/test/scala/akka/routing/RoutingSpec.scala        | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala
index 2b946ec1da..2598f26233 100644
--- a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala
@@ -153,6 +153,15 @@ class RoutingSpec extends AkkaSpec(RoutingSpec.config) with DefaultTimeout with
         expectMsgType[RouterRoutees].routees.head ! Kill
       }
       expectMsgType[ActorKilledException]
+
+      //#supervision
+
+      val router2 = system.actorOf(Props.empty.withRouter(RoundRobinRouter(1).withSupervisorStrategy(escalator)))
+      router2 ! CurrentRoutees
+      EventFilter[ActorKilledException](occurrences = 2) intercept {
+        expectMsgType[RouterRoutees].routees.head ! Kill
+      }
+      expectMsgType[ActorKilledException]
     }
 
     "default to all-for-one-always-escalate strategy" in {