Shutdown hook modification.

Don't mark shutdown hooks as daemon threads, although it does not seem
to make any difference. Instead have the code which waits for all
threads to be complete be smarted about which codes to monitor. No
review.

1 files changed, 37 insertions, 0 deletions

diff --git a/test/files/run/shutdownhooks.scala b/test/files/run/shutdownhooks.scala
new file mode 100644
index 0000000000..7fe5d129d6
--- /dev/null
+++ b/test/files/run/shutdownhooks.scala
@@ -0,0 +1,37 @@
+object Test {
+  scala.sys.addShutdownHook {
+    Thread.sleep(1000)
+    println("Test#shutdown.")
+  }
+
+  def daemon() = {
+    val t = new Thread {
+      override def run() {
+        Thread.sleep(10000)
+        println("Hallelujah!") // should not see this
+      }
+    }
+    t.setDaemon(true)
+    t.start()
+    t
+  }
+
+  def nonDaemon() = {
+    val t = new Thread {
+      override def run() {
+        Thread.sleep(100)
+        println("Fooblitzky!")
+      }
+    }
+    t.start()
+    t
+  }
+
+  def main(args: Array[String]): Unit = {
+    daemon()
+    nonDaemon()
+    scala.sys.addShutdownHook {
+      println("main#shutdown.")
+    }
+  }
+}