Skip to content

Commit 462e22d

Browse files
committed
Merge pull request scala#4649 from janekdb/2.12.x-noTraceSuppression
Align noTraceSuppression val names to system property name
2 parents d7cf43f + f712d68 commit 462e22d

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/library/scala/sys/SystemProperties.scala

+3-1
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ object SystemProperties {
8686
lazy val headless = bool("java.awt.headless", "system should not utilize a display device")
8787
lazy val preferIPv4Stack = bool("java.net.preferIPv4Stack", "system should prefer IPv4 sockets")
8888
lazy val preferIPv6Addresses = bool("java.net.preferIPv6Addresses", "system should prefer IPv6 addresses")
89-
lazy val noTraceSupression = bool("scala.control.noTraceSuppression", "scala should not suppress any stack trace creation")
89+
lazy val noTraceSuppression = bool("scala.control.noTraceSuppression", "scala should not suppress any stack trace creation")
90+
@deprecated("Use noTraceSuppression", "2.12.0")
91+
def noTraceSupression = noTraceSuppression
9092
}
9193

src/library/scala/util/control/NoStackTrace.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ trait NoStackTrace extends Throwable {
2626
object NoStackTrace {
2727
final def noSuppression = _noSuppression
2828

29-
// two-stage init to make checkinit happy, since sys.SystemProperties.noTraceSupression.value calls back into NoStackTrace.noSuppression
29+
// two-stage init to make checkinit happy, since sys.SystemProperties.noTraceSuppression.value calls back into NoStackTrace.noSuppression
3030
final private var _noSuppression = false
31-
_noSuppression = sys.SystemProperties.noTraceSupression.value
31+
_noSuppression = sys.SystemProperties.noTraceSuppression.value
3232
}

test/disabled/run/applet-prop.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class S extends javax.swing.JApplet {
88

99
object Test extends SecurityTest {
1010
val s = new S
11-
// lazy val TestKey = sys.SystemProperties.noTraceSupression.key
11+
// lazy val TestKey = sys.SystemProperties.noTraceSuppression.key
1212
// def hitPerm() = new Throwable with scala.util.control.ControlThrowable { }
1313
//
1414
// var throwing = false

0 commit comments

Comments
 (0)