diff options
author | aleksandar <aleksandar@lampmac14.epfl.ch> | 2012-01-25 15:34:18 +0100 |
---|---|---|
committer | aleksandar <aleksandar@lampmac14.epfl.ch> | 2012-01-25 15:41:51 +0100 |
commit | 4abec1f64da57268ada7126f22894d1b50ebdbd8 (patch) | |
tree | 72565438745c371928768ce258973b4dcfae97ef /test/files/run | |
parent | cc3ad6e00ad3a5cfcbbc47bf62f425a31911f79f (diff) | |
download | scala-4abec1f64da57268ada7126f22894d1b50ebdbd8.tar.gz scala-4abec1f64da57268ada7126f22894d1b50ebdbd8.tar.bz2 scala-4abec1f64da57268ada7126f22894d1b50ebdbd8.zip |
Fix for SI-5375.
Changed CompositeThrowable to inherit Exception instead of Throwable.
A few minor fixes for the jdk1.5 parallel collection tasks.
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/si5375.check | 1 | ||||
-rw-r--r-- | test/files/run/si5375.scala | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/test/files/run/si5375.check b/test/files/run/si5375.check new file mode 100644 index 0000000000..7d3002ffda --- /dev/null +++ b/test/files/run/si5375.check @@ -0,0 +1 @@ +Composite throwable
\ No newline at end of file diff --git a/test/files/run/si5375.scala b/test/files/run/si5375.scala new file mode 100644 index 0000000000..e4b329deae --- /dev/null +++ b/test/files/run/si5375.scala @@ -0,0 +1,19 @@ + + + +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") + } + } + +} |