diff options
| -rw-r--r-- | src/library/scala/Enumeration.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/util/control/NoStackTrace.scala | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/library/scala/Enumeration.scala b/src/library/scala/Enumeration.scala index 80571943e5..dc67d32ba0 100644 --- a/src/library/scala/Enumeration.scala +++ b/src/library/scala/Enumeration.scala @@ -81,7 +81,7 @@ abstract class Enumeration (initial: Int) extends Serializable { /** The cache listing all values of this enumeration. */ @transient private var vset: ValueSet = null - @transient private var vsetDefined = false + @transient @volatile private var vsetDefined = false /** The mapping from the integer used to identify values to their * names. */ diff --git a/src/library/scala/util/control/NoStackTrace.scala b/src/library/scala/util/control/NoStackTrace.scala index dff29c86b4..c2b5dbca22 100644 --- a/src/library/scala/util/control/NoStackTrace.scala +++ b/src/library/scala/util/control/NoStackTrace.scala @@ -23,5 +23,9 @@ trait NoStackTrace extends Throwable { } object NoStackTrace { - final val noSuppression = sys.SystemProperties.noTraceSupression.value + final def noSuppression = _noSuppression + + // two-stage init to make checkinit happy, since sys.SystemProperties.noTraceSupression.value calls back into NoStackTrace.noSuppression + final private var _noSuppression = false + _noSuppression = sys.SystemProperties.noTraceSupression.value } |