summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDominik Gruntz <dominik.gruntz@fhnw.ch>2012-04-10 15:13:53 +0200
committerDominik Gruntz <dominik.gruntz@fhnw.ch>2012-04-10 15:13:53 +0200
commitaf4e0f0991ee5c3304fc4bf05c91f5d1fa480143 (patch)
tree278bd0e57ac6d650cad42d4645332658a8defa96 /src
parentbed400c5a8d4fc5f5ee4b270f757cdfae94c3f6a (diff)
downloadscala-af4e0f0991ee5c3304fc4bf05c91f5d1fa480143.tar.gz
scala-af4e0f0991ee5c3304fc4bf05c91f5d1fa480143.tar.bz2
scala-af4e0f0991ee5c3304fc4bf05c91f5d1fa480143.zip
SI-5571: adds @volatile to field Enumeration.vsetDefined
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/Enumeration.scala2
1 files changed, 1 insertions, 1 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. */