summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorHeather Miller <heather.miller@epfl.ch>2012-07-06 11:42:05 +0200
committerHeather Miller <heather.miller@epfl.ch>2012-07-06 11:42:05 +0200
commitab87bbe8a5728d198057824d3a8c32cfbe20978a (patch)
tree2fdd79deb6ee9e0a827c70422052c99972d6cfaf /src/library
parentd2fd2922e71dddb2c22c1a5b0cf36614cd78e1b4 (diff)
downloadscala-ab87bbe8a5728d198057824d3a8c32cfbe20978a.tar.gz
scala-ab87bbe8a5728d198057824d3a8c32cfbe20978a.tar.bz2
scala-ab87bbe8a5728d198057824d3a8c32cfbe20978a.zip
Updates scala.util.control.NonFatal documentation, as suggested in code review
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/util/control/NonFatal.scala15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/library/scala/util/control/NonFatal.scala b/src/library/scala/util/control/NonFatal.scala
index b3d60e2922..9da2f63307 100644
--- a/src/library/scala/util/control/NonFatal.scala
+++ b/src/library/scala/util/control/NonFatal.scala
@@ -9,17 +9,20 @@
package scala.util.control
/**
- * Extractor of non-fatal Throwables. Will not match fatal errors
- * like VirtualMachineError (OutOfMemoryError)
- * ThreadDeath, LinkageError and InterruptedException.
- * StackOverflowError is matched, i.e. considered non-fatal.
+ * Extractor of non-fatal Throwables. Will not match fatal errors like `VirtualMachineError`
+ * (for example, `OutOfMemoryError`, a subclass of `VirtualMachineError`), `ThreadDeath`,
+ * `LinkageError`, `InterruptedException`, `ControlThrowable`, or `NotImplementedError`.
+ * However, `StackOverflowError` is matched, i.e. considered non-fatal.
*
- * Usage to catch all harmless throwables:
+ * Note that [[scala.util.control.ControlThrowable]], an internal Throwable, is not matched by
+ * `NonFatal` (and would therefore be thrown).
+ *
+ * For example, all harmless Throwables can be caught by:
* {{{
* try {
* // dangerous stuff
* } catch {
- * case NonFatal(e) => log.error(e, "Something not that bad")
+ * case NonFatal(e) => log.error(e, "Something not that bad.")
* }
* }}}
*/