diff options
author | James Iry <jamesiry@gmail.com> | 2013-05-28 13:34:16 -0700 |
---|---|---|
committer | James Iry <jamesiry@gmail.com> | 2013-05-28 13:34:16 -0700 |
commit | b88801fac7cb1d7d38d4b3cca4aab4603c48527e (patch) | |
tree | c78ac97a48429208bba74657ca451b3dd0ce2f47 /test/files | |
parent | 96e67c22b3b7bdf54081ba8a194a68e8b7b4740c (diff) | |
parent | bcbe38d184eb5b4ee2169ac82bcafad9c0051520 (diff) | |
download | scala-b88801fac7cb1d7d38d4b3cca4aab4603c48527e.tar.gz scala-b88801fac7cb1d7d38d4b3cca4aab4603c48527e.tar.bz2 scala-b88801fac7cb1d7d38d4b3cca4aab4603c48527e.zip |
Merge pull request #2563 from soc/SI-7474
SI-7474 Parallel collections: End the exception handling madness
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/run/t5375.check | 2 | ||||
-rw-r--r-- | test/files/run/t5375.scala | 23 |
2 files changed, 7 insertions, 18 deletions
diff --git a/test/files/run/t5375.check b/test/files/run/t5375.check index 7d3002ffda..b1a57eeeec 100644 --- a/test/files/run/t5375.check +++ b/test/files/run/t5375.check @@ -1 +1 @@ -Composite throwable
\ No newline at end of file +Runtime exception diff --git a/test/files/run/t5375.scala b/test/files/run/t5375.scala index fa5932ff89..826ecd841e 100644 --- a/test/files/run/t5375.scala +++ b/test/files/run/t5375.scala @@ -1,19 +1,8 @@ - - - -import collection.parallel.CompositeThrowable - - - -object Test { - - def main(args: Array[String]) { - val foos = (1 to 1000).toSeq - try { - foos.par.map(i => if (i % 37 == 0) sys.error("i div 37") else i) - } catch { - case CompositeThrowable(thr) => println("Composite throwable") - } +object Test extends App { + val foos = (1 to 1000).toSeq + try + foos.par.map(i => if (i % 37 == 0) sys.error("i div 37") else i) + catch { + case ex: RuntimeException => println("Runtime exception") } - } |