diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2015-07-27 13:30:20 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2015-07-27 13:30:20 +1000 |
commit | 462e22d2f25bb9432c5a1e7bf20f391e6424f7a9 (patch) | |
tree | 4e20c0227587d4754612a9d2a3d6ad2b4ff81015 | |
parent | d7cf43f6933f6cdcca253ae5792ad9325da35ecf (diff) | |
parent | f712d68ea69551ff745caffce04159bc140bcedc (diff) | |
download | scala-462e22d2f25bb9432c5a1e7bf20f391e6424f7a9.tar.gz scala-462e22d2f25bb9432c5a1e7bf20f391e6424f7a9.tar.bz2 scala-462e22d2f25bb9432c5a1e7bf20f391e6424f7a9.zip |
Merge pull request #4649 from janekdb/2.12.x-noTraceSuppression
Align noTraceSuppression val names to system property name
-rw-r--r-- | src/library/scala/sys/SystemProperties.scala | 4 | ||||
-rw-r--r-- | src/library/scala/util/control/NoStackTrace.scala | 4 | ||||
-rw-r--r-- | test/disabled/run/applet-prop.scala | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/library/scala/sys/SystemProperties.scala b/src/library/scala/sys/SystemProperties.scala index 6f8b13a89b..3ee4f6c708 100644 --- a/src/library/scala/sys/SystemProperties.scala +++ b/src/library/scala/sys/SystemProperties.scala @@ -86,6 +86,8 @@ object SystemProperties { lazy val headless = bool("java.awt.headless", "system should not utilize a display device") lazy val preferIPv4Stack = bool("java.net.preferIPv4Stack", "system should prefer IPv4 sockets") lazy val preferIPv6Addresses = bool("java.net.preferIPv6Addresses", "system should prefer IPv6 addresses") - lazy val noTraceSupression = bool("scala.control.noTraceSuppression", "scala should not suppress any stack trace creation") + lazy val noTraceSuppression = bool("scala.control.noTraceSuppression", "scala should not suppress any stack trace creation") + @deprecated("Use noTraceSuppression", "2.12.0") + def noTraceSupression = noTraceSuppression } diff --git a/src/library/scala/util/control/NoStackTrace.scala b/src/library/scala/util/control/NoStackTrace.scala index b33b6a18dd..3c42944af1 100644 --- a/src/library/scala/util/control/NoStackTrace.scala +++ b/src/library/scala/util/control/NoStackTrace.scala @@ -26,7 +26,7 @@ trait NoStackTrace extends Throwable { object NoStackTrace { final def noSuppression = _noSuppression - // two-stage init to make checkinit happy, since sys.SystemProperties.noTraceSupression.value calls back into NoStackTrace.noSuppression + // two-stage init to make checkinit happy, since sys.SystemProperties.noTraceSuppression.value calls back into NoStackTrace.noSuppression final private var _noSuppression = false - _noSuppression = sys.SystemProperties.noTraceSupression.value + _noSuppression = sys.SystemProperties.noTraceSuppression.value } diff --git a/test/disabled/run/applet-prop.scala b/test/disabled/run/applet-prop.scala index 9c29dfd979..7a98c25cab 100644 --- a/test/disabled/run/applet-prop.scala +++ b/test/disabled/run/applet-prop.scala @@ -8,7 +8,7 @@ class S extends javax.swing.JApplet { object Test extends SecurityTest { val s = new S - // lazy val TestKey = sys.SystemProperties.noTraceSupression.key + // lazy val TestKey = sys.SystemProperties.noTraceSuppression.key // def hitPerm() = new Throwable with scala.util.control.ControlThrowable { } // // var throwing = false |