Merged revisions 22536,22540,22542 via svnmerge...

Merged revisions 22536,22540,22542 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk

........
  r22536 | phaller | 2010-07-12 10:29:45 +0200 (Mon, 12 Jul 2010) | 1 line

  Added test case for #3645. Closes #3645.
........
  r22540 | phaller | 2010-07-12 13:49:28 +0200 (Mon, 12 Jul 2010) | 1 line

  Fixed buggy test case. Closes #3551. No review.
........
  r22542 | phaller | 2010-07-12 16:13:11 +0200 (Mon, 12 Jul 2010) | 1 line

  Updated LinkedBlockingQueue to latest jsr166
version. Verified bug fix using test case in
[http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6806875 JDK bug
report 6806875]. Closes #3629. ........

2 files changed, 15 insertions, 3 deletions

diff --git a/test/files/jvm/actor-executor2.scala b/test/files/jvm/actor-executor2.scala
index da64a7fc43..f8fcaef69f 100644
--- a/test/files/jvm/actor-executor2.scala
+++ b/test/files/jvm/actor-executor2.scala
@@ -1,6 +1,6 @@
 import scala.actors.{Actor, SchedulerAdapter, Exit}
 import Actor._
-import java.util.concurrent.Executors
+import java.util.concurrent.{Executors, RejectedExecutionException}
 
 object One extends AdaptedActor {
   def act() {
@@ -57,9 +57,15 @@ object Test {
   val scheduler =
     new SchedulerAdapter {
       def execute(block: => Unit) {
-        executor.execute(new Runnable {
+        val task = new Runnable {
           def run() { block }
-        })
+        }
+        try {
+          executor.execute(task)
+        } catch {
+          case ree: RejectedExecutionException =>
+            task.run() // run task on current thread
+        }
       }
     }
 
diff --git a/test/files/run/t3645.scala b/test/files/run/t3645.scala
new file mode 100644
index 0000000000..af2543377b
--- /dev/null
+++ b/test/files/run/t3645.scala
@@ -0,0 +1,6 @@
+object Test {
+  def main(args: Array[String]) {
+    val s = Stream.tabulate(5)(x => x+2)
+    assert( s.toList == List(2,3,4,5,6) )
+  }
+}