From fa8012d28687986902ce1255a19f9f49affb3bca Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Tue, 14 Jul 2015 15:00:49 -0700
Subject: Remove our fork of forkjoin. Java 8 bundles it.

Provide deprecated compatibility stubs for the types and static members,
which forward as follows:

```
scala.concurrent.forkjoin.ForkJoinPool         => java.util.concurrent.ForkJoinPool
scala.concurrent.forkjoin.ForkJoinTask         => java.util.concurrent.ForkJoinTask
scala.concurrent.forkjoin.ForkJoinWorkerThread => java.util.concurrent.ForkJoinWorkerThread
scala.concurrent.forkjoin.LinkedTransferQueue  => java.util.concurrent.LinkedTransferQueue
scala.concurrent.forkjoin.RecursiveAction      => java.util.concurrent.RecursiveAction
scala.concurrent.forkjoin.RecursiveTask        => java.util.concurrent.RecursiveTask
scala.concurrent.forkjoin.ThreadLocalRandom    => java.util.concurrent.ThreadLocalRandom
```

To prepare for Java 9, the Scala library does not itself use `sun.misc.Unsafe`.
However, for now, it provide a convenience accessor for it
via `scala.concurrent.util.Unsafe`. This (deprecated) class will
be removed as soon as the eco-system drops its use
(akka-actor, I'm looking at you).
---
 test/files/jvm/t7146.check |  7 +++----
 test/files/jvm/t7146.scala | 28 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 18 deletions(-)

(limited to 'test')

diff --git a/test/files/jvm/t7146.check b/test/files/jvm/t7146.check
index 7c76040205..b2c6e444f7 100644
--- a/test/files/jvm/t7146.check
+++ b/test/files/jvm/t7146.check
@@ -1,5 +1,4 @@
-should be scala.concurrent.impl.ExecutionContextImpl == true
-should be scala.concurrent.forkjoin.ForkJoinPool == true
+ExecutionContext.global is a scala.concurrent.impl.ExecutionContextImpl.
 should have non-null UncaughtExceptionHandler == true
-should be a scala.concurrent.impl.ExecutionContextImpl UncaughtExceptionHandler == true
-should just print out on uncaught == true
+ExecutionContext.global.executor.getUncaughtExceptionHandler is a scala.concurrent.impl.ExecutionContextImpl.
+should just print out on uncaught: true
diff --git a/test/files/jvm/t7146.scala b/test/files/jvm/t7146.scala
index ea734472d5..89030730a9 100644
--- a/test/files/jvm/t7146.scala
+++ b/test/files/jvm/t7146.scala
@@ -5,21 +5,21 @@ import scala.concurrent._
 import scala.util.control.NoStackTrace
 
 object Test {
-  def main(args: Array[String]) {
-    println("should be scala.concurrent.impl.ExecutionContextImpl == " +
-      ExecutionContext.global.toString.startsWith("scala.concurrent.impl.ExecutionContextImpl"))
-    val i = ExecutionContext.global.asInstanceOf[{ def executor: Executor }]
-    println("should be scala.concurrent.forkjoin.ForkJoinPool == " +
-      (i.executor.getClass.getSuperclass.getName == "scala.concurrent.forkjoin.ForkJoinPool"))
-    val u = i.executor.
+  def main(args: Array[String]): Unit = {
+    val ec = ExecutionContext.global.toString
+    if (ec startsWith "scala.concurrent.impl.ExecutionContextImpl")
+      println("ExecutionContext.global is a scala.concurrent.impl.ExecutionContextImpl.")
+    else println(s"!! ExecutionContext.global == $ec")
+
+    val u = ExecutionContext.global.asInstanceOf[{ def executor: Executor }].executor.
              asInstanceOf[{ def getUncaughtExceptionHandler: Thread.UncaughtExceptionHandler }].
              getUncaughtExceptionHandler
-    println("should have non-null UncaughtExceptionHandler == " + (u ne null))
-    println("should be a scala.concurrent.impl.ExecutionContextImpl UncaughtExceptionHandler == " +
-      u.toString.startsWith("scala.concurrent.impl.ExecutionContextImpl"))
-    print("should just print out on uncaught == ")
-    u.uncaughtException(Thread.currentThread, new Throwable {
-      override def printStackTrace() { println("true") }
-    })
+    println(s"should have non-null UncaughtExceptionHandler == ${u ne null}")
+    if (u.toString startsWith "scala.concurrent.impl.ExecutionContextImpl")
+      println("ExecutionContext.global.executor.getUncaughtExceptionHandler is a scala.concurrent.impl.ExecutionContextImpl.")
+    else println(s"!! ExecutionContext.global.executor.getUncaughtExceptionHandler == $u")
+
+    print("should just print out on uncaught: ")
+    u.uncaughtException(Thread.currentThread, new Throwable { override def printStackTrace() { println("true") } })
   }
 }
-- 
cgit v1.2.3