diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2012-08-21 21:53:53 -0400 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-08-21 21:53:53 -0400 |
| commit | e512d1aead7afdca8748cfaced3d707a23d528c3 (patch) | |
| tree | a46d3ebc95202443a3233da2d88cbcd83c9efc7e | |
| parent | 1ab4994990a21c1ea4dadcf15368013d89456ca6 (diff) | |
| download | scala-e512d1aead7afdca8748cfaced3d707a23d528c3.tar.gz scala-e512d1aead7afdca8748cfaced3d707a23d528c3.tar.bz2 scala-e512d1aead7afdca8748cfaced3d707a23d528c3.zip | |
Fix stupid logic inversion of try-catch
| -rw-r--r-- | src/library/scala/util/control/Exception.scala | 2 | ||||
| -rw-r--r-- | test/files/run/try-catch-unify.check | 1 | ||||
| -rw-r--r-- | test/files/run/try-catch-unify.scala | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/library/scala/util/control/Exception.scala b/src/library/scala/util/control/Exception.scala index 4a5209ecab..1567e06c22 100644 --- a/src/library/scala/util/control/Exception.scala +++ b/src/library/scala/util/control/Exception.scala @@ -145,7 +145,7 @@ object Exception { } final val nothingCatcher: Catcher[Nothing] = mkThrowableCatcher(_ => false, throw _) - final def nonFatalCatcher[T]: Catcher[T] = mkThrowableCatcher({ case NonFatal(_) => false; case _ => true }, throw _) + final def nonFatalCatcher[T]: Catcher[T] = mkThrowableCatcher({ case NonFatal(_) => true; case _ => false }, throw _) final def allCatcher[T]: Catcher[T] = mkThrowableCatcher(_ => true, throw _) /** The empty `Catch` object. */ diff --git a/test/files/run/try-catch-unify.check b/test/files/run/try-catch-unify.check index b1de2bfa74..67a8c64a33 100644 --- a/test/files/run/try-catch-unify.check +++ b/test/files/run/try-catch-unify.check @@ -1,3 +1,4 @@ Failure(java.lang.NumberFormatException: For input string: "Hi") Success(5.0) O NOES +Failure(java.lang.NumberFormatException: For input string: "Hi") diff --git a/test/files/run/try-catch-unify.scala b/test/files/run/try-catch-unify.scala index 0d819ab957..8cb14d060e 100644 --- a/test/files/run/try-catch-unify.scala +++ b/test/files/run/try-catch-unify.scala @@ -11,5 +11,6 @@ object Test { } catch { case t => println(t.getMessage) } + println(nonFatalCatch withTry ("Hi".toDouble)) } } |