Hardened actor tests. No review.

1 files changed, 10 insertions, 0 deletions

diff --git a/test/files/jvm/actor-executor.scala b/test/files/jvm/actor-executor.scala
index 435c666fff..b1f9caebdd 100644
--- a/test/files/jvm/actor-executor.scala
+++ b/test/files/jvm/actor-executor.scala
@@ -9,6 +9,7 @@ trait AdaptedActor extends Actor {
 
 object One extends AdaptedActor {
   def act() {
+    try {
     Two.start()
     var i = 0
     loopWhile (i < 10000) {
@@ -22,11 +23,16 @@ object One extends AdaptedActor {
             Test.executor.shutdown()
       }
     }
+    } catch {
+      case e: Throwable if !e.isInstanceOf[scala.util.control.ControlThrowable] =>
+        e.printStackTrace()
+    }
   }
 }
 
 object Two extends AdaptedActor {
   def act() {
+    try {
     var i = 0
     loopWhile (i < 10000) {
       i += 1
@@ -37,6 +43,10 @@ object Two extends AdaptedActor {
           One ! 'MsgForOne
       }
     }
+    } catch {
+      case e: Throwable if !e.isInstanceOf[scala.util.control.ControlThrowable] =>
+        e.printStackTrace()
+    }
   }
 }