summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJames Iry <jamesiry@gmail.com>2013-02-22 08:58:50 -0800
committerJames Iry <jamesiry@gmail.com>2013-02-22 08:58:50 -0800
commit58abbb9782755d7bb56775f714bb95df45a34dd9 (patch)
tree61986626110096645da6b5539a67eae2d29be8a5 /src
parentb8cceea6e722d1b0098b6b68538dd342307b258b (diff)
parent68f62d7e9c200034bd42ffaf795b57fb379d9d38 (diff)
downloadscala-58abbb9782755d7bb56775f714bb95df45a34dd9.tar.gz
scala-58abbb9782755d7bb56775f714bb95df45a34dd9.tar.bz2
scala-58abbb9782755d7bb56775f714bb95df45a34dd9.zip
Merge pull request #2154 from viktorklang/wip-SI7164-nonfatal-notimplementederror
SI-7164 - Removing NotImplementedError as Fatal from s.u.c.NonFatal
Diffstat (limited to 'src')
-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
}
/**