diff options
author | Vlad Ureche <vlad.ureche@epfl.ch> | 2014-09-12 16:57:19 +0200 |
---|---|---|
committer | Vlad Ureche <vlad.ureche@epfl.ch> | 2014-09-12 16:57:19 +0200 |
commit | 7b591540fd46f4e8d6e4f589efe7abe468d69ca4 (patch) | |
tree | e7f8f7749518c525e5bf6c2a7a5e86267768e3c0 /src/library | |
parent | 5046f7bc99b78447dfa34c891b2b413ca47bb8f9 (diff) | |
parent | b416dc6be9079bd9940d0585c49a12288020dcdf (diff) | |
download | scala-7b591540fd46f4e8d6e4f589efe7abe468d69ca4.tar.gz scala-7b591540fd46f4e8d6e4f589efe7abe468d69ca4.tar.bz2 scala-7b591540fd46f4e8d6e4f589efe7abe468d69ca4.zip |
Merge pull request #3977 from terma/issue/8817
SI-8817 Correct scaladoc for scala.sys.addShutdownHook
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/sys/package.scala | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/library/scala/sys/package.scala b/src/library/scala/sys/package.scala index 386bd84113..e493603bc2 100644 --- a/src/library/scala/sys/package.scala +++ b/src/library/scala/sys/package.scala @@ -61,16 +61,15 @@ package object sys { def env: immutable.Map[String, String] = immutable.Map(System.getenv().asScala.toSeq: _*) /** Register a shutdown hook to be run when the VM exits. - * The newly created thread is marked as a daemon so it will not - * interfere with VM shutdown. The hook is automatically registered: - * the returned value can be ignored, but is available in case the - * Thread requires further modification. It can also be unregistered - * by calling ShutdownHookThread#remove(). + * The hook is automatically registered: the returned value can be ignored, + * but is available in case the Thread requires further modification. + * It can also be unregistered by calling ShutdownHookThread#remove(). * * Note that shutdown hooks are NOT guaranteed to be run. * * @param body the body of code to run at shutdown * @return the Thread which will run the shutdown hook. + * @see [[scala.sys.ShutdownHookThread]] */ def addShutdownHook(body: => Unit): ShutdownHookThread = ShutdownHookThread(body) |