summaryrefslogtreecommitdiff
path: root/src/library/scala/util/control
diff options
context:
space:
mode:
authorViktor Klang <viktor.klang@gmail.com>2013-02-21 15:31:48 +0100
committerViktor Klang <viktor.klang@gmail.com>2013-02-21 17:04:57 +0100
commit68f62d7e9c200034bd42ffaf795b57fb379d9d38 (patch)
tree04c59267a2e4523e33cd7aa25e036b5f09bcd739 /src/library/scala/util/control
parent70956e560a11996e1d801d59b312dfe9d56b7a74 (diff)
downloadscala-68f62d7e9c200034bd42ffaf795b57fb379d9d38.tar.gz
scala-68f62d7e9c200034bd42ffaf795b57fb379d9d38.tar.bz2
scala-68f62d7e9c200034bd42ffaf795b57fb379d9d38.zip
SI-7164 - Removing NotImplementedError as Fatal from s.u.c.NonFatal
Diffstat (limited to 'src/library/scala/util/control')
-rw-r--r--src/library/scala/util/control/NonFatal.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/util/control/NonFatal.scala b/src/library/scala/util/control/NonFatal.scala
index 0d8cdfbace..74478f2a49 100644
--- a/src/library/scala/util/control/NonFatal.scala
+++ b/src/library/scala/util/control/NonFatal.scala
@@ -11,7 +11,7 @@ package scala.util.control
/**
* 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`.
+ * `LinkageError`, `InterruptedException`, `ControlThrowable`.
* However, `StackOverflowError` is matched, i.e. considered non-fatal.
*
* Note that [[scala.util.control.ControlThrowable]], an internal Throwable, is not matched by
@@ -35,7 +35,7 @@ object NonFatal {
def apply(t: Throwable): Boolean = t match {
case _: StackOverflowError => true // StackOverflowError ok even though it is a VirtualMachineError
// VirtualMachineError includes OutOfMemoryError and other fatal errors
- case _: VirtualMachineError | _: ThreadDeath | _: InterruptedException | _: LinkageError | _: ControlThrowable | _: NotImplementedError => false
+ case _: VirtualMachineError | _: ThreadDeath | _: InterruptedException | _: LinkageError | _: ControlThrowable => false
case _ => true
}
/**