1 files changed, 12 insertions, 8 deletions
diff --git a/test/files/jvm/actor-exceptions.scala b/test/files/jvm/actor-exceptions.scala
index ccec84c56c..77bf05c048 100644
--- a/test/files/jvm/actor-exceptions.scala
+++ b/test/files/jvm/actor-exceptions.scala
@@ -2,7 +2,13 @@
 import scala.actors.{Actor, Exit}
 import Actor._
 
-case class MyException(text: String) extends Exception
+case class MyException(text: String) extends Exception {
+  override def fillInStackTrace() = this
+}
+
+case class MyOtherException(text: String) extends Exception {
+  override def fillInStackTrace() = this
+}
 
 object Master extends Actor {
   trapExit = true
@@ -11,14 +17,15 @@ object Master extends Actor {
     Slave.start()
     for (i <- 0 until 10) Slave ! A
     react {
-      case Exit(from, reason) => println("slave exited because of "+reason)
+      case Exit(from, reason) =>
     }
   }
 }
 
 object Slave extends Actor {
+  override def toString = "Slave"
   override def exceptionHandler: PartialFunction[Exception, Unit] = {
-    case MyException(text) => println(text)
+    case MyException(text) =>
   }
   def act() {
     var cnt = 0
@@ -27,11 +34,8 @@ object Slave extends Actor {
         case A =>
           cnt += 1
           if (cnt % 2 != 0) throw MyException("problem")
-          if (cnt < 10)
-            println("received A")
-          else {
-            println("received last A")
-            throw new Exception("unhandled")
+          if (cnt == 10) {
+            throw new MyOtherException("unhandled")
           }
       }
     }