From f2ff09771c9199e9f7df2c8000e498d911f5416f Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Thu, 16 May 2013 18:10:56 +0200
Subject: [PATCH] Shutdown ordering issue in RemoteDeploymentDeathWatchSpec,
 see #3334

---
 .../scala/akka/remote/RemoteDeploymentDeathWatchSpec.scala  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeploymentDeathWatchSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeploymentDeathWatchSpec.scala
index 6d51ec989a..668b1e7d8b 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeploymentDeathWatchSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeploymentDeathWatchSpec.scala
@@ -95,10 +95,8 @@ abstract class RemoteDeploymentDeathWatchSpec
         testConductor.exit(third, 0).await
         enterBarrier("third-crashed")
 
-        runOn(first) {
-          // second system will be shutdown
-          testConductor.shutdown(second)
-        }
+        // second system will be shutdown
+        testConductor.shutdown(second).await
 
         enterBarrier("after-3")
       }