Merge branch 'wip-1466-remove-stop-rk'

akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java

@@ -113,7 +113,7 @@ public class Pi {
                 Result result = (Result) message;
                 pi += result.getValue();
                 nrOfResults += 1;
-                if (nrOfResults == nrOfMessages) getSelf().stop();
+                if (nrOfResults == nrOfMessages) getContext().stop(getSelf());
             } else throw new IllegalArgumentException("Unknown message [" + message + "]");
             //#handle-messages
         }
@@ -157,7 +157,7 @@ public class Pi {
         latch.await();
 
         // Shut down the system
-        system.stop();
+        system.shutdown();
     }
 }
-//#app
+//#app

akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala

@@ -62,7 +62,7 @@ object Pi extends App {
         pi += value
         nrOfResults += 1
         // Stops this actor and all its supervised children
-        if (nrOfResults == nrOfMessages) self.stop()
+        if (nrOfResults == nrOfMessages) context.stop(self)
       //#handle-messages
     }
     //#master-receive
@@ -98,7 +98,7 @@ object Pi extends App {
     latch.await()
 
     // Shut down the system
-    system.stop()
+    system.shutdown()
   }
 }
 //#app

akka-tutorials/akka-tutorial-first/src/test/scala/WorkerSpec.scala

@@ -17,7 +17,7 @@ class WorkerSpec extends WordSpec with MustMatchers with BeforeAndAfterAll {
   implicit val system = ActorSystem()
 
   override def afterAll {
-    system.stop()
+    system.shutdown()
   }
 
   "Worker" must {