Merge branch 2.10.1 into master

Conflicts:
	src/compiler/scala/tools/nsc/ast/Trees.scala
	src/library/scala/concurrent/impl/ExecutionContextImpl.scala

2 files changed, 28 insertions, 0 deletions

diff --git a/test/files/jvm/t7146.check b/test/files/jvm/t7146.check
new file mode 100644
index 0000000000..7c76040205
--- /dev/null
+++ b/test/files/jvm/t7146.check
@@ -0,0 +1,5 @@
+should be scala.concurrent.impl.ExecutionContextImpl == true
+should be scala.concurrent.forkjoin.ForkJoinPool == true
+should have non-null UncaughtExceptionHandler == true
+should be a scala.concurrent.impl.ExecutionContextImpl UncaughtExceptionHandler == true
+should just print out on uncaught == true
diff --git a/test/files/jvm/t7146.scala b/test/files/jvm/t7146.scala
new file mode 100644
index 0000000000..2bd03d6d02
--- /dev/null
+++ b/test/files/jvm/t7146.scala
@@ -0,0 +1,23 @@
+import java.util.concurrent.Executor
+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.toString.startsWith("scala.concurrent.forkjoin.ForkJoinPool"))
+    val u = i.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") }
+    })
+  }
+}