diff options
author | Philipp Haller <hallerp@gmail.com> | 2010-04-13 14:41:02 +0000 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2010-04-13 14:41:02 +0000 |
commit | bc791369f79f2d1a72a93674eb7b0f34ca58d8d1 (patch) | |
tree | a29f5941272cbe318f67f446d8202156da0ecf06 /test/files/jvm/actor-executor2.scala | |
parent | c54b7a99e8a4913ceee3f40631edba72c33145ec (diff) | |
download | scala-bc791369f79f2d1a72a93674eb7b0f34ca58d8d1.tar.gz scala-bc791369f79f2d1a72a93674eb7b0f34ca58d8d1.tar.bz2 scala-bc791369f79f2d1a72a93674eb7b0f34ca58d8d1.zip |
Hardened actor tests. No review.
Diffstat (limited to 'test/files/jvm/actor-executor2.scala')
-rw-r--r-- | test/files/jvm/actor-executor2.scala | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/test/files/jvm/actor-executor2.scala b/test/files/jvm/actor-executor2.scala index 9e99e167aa..da64a7fc43 100644 --- a/test/files/jvm/actor-executor2.scala +++ b/test/files/jvm/actor-executor2.scala @@ -4,6 +4,7 @@ import java.util.concurrent.Executors object One extends AdaptedActor { def act() { + try { Two.start() var i = 0 loopWhile (i < Test.NUM_MSG) { @@ -15,11 +16,16 @@ object One extends AdaptedActor { println("One: OK") } } + } 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 < Test.NUM_MSG) { i += 1 @@ -30,6 +36,10 @@ object Two extends AdaptedActor { One ! 'MsgForOne } } + } catch { + case e: Throwable if !e.isInstanceOf[scala.util.control.ControlThrowable] => + e.printStackTrace() + } } } @@ -54,6 +64,7 @@ object Test { } def main(args: Array[String]) { + try { self.trapExit = true link(One) One.start() @@ -63,5 +74,9 @@ object Test { println("One exited") Test.executor.shutdown() } + } catch { + case e: Throwable if !e.isInstanceOf[scala.util.control.ControlThrowable] => + e.printStackTrace() + } } } |