summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2009-12-02 01:01:45 +0000
committerPaul Phillips <paulp@improving.org>2009-12-02 01:01:45 +0000
commitf54e15370e7e90aa303103c8d3aadb22d0164b10 (patch)
treeb1110ccd4a35570f3df03b23d3f351b10b97fd8c /src
parenta3bf3f136caaefa98268607a3529b7554df5fc80 (diff)
downloadscala-f54e15370e7e90aa303103c8d3aadb22d0164b10.tar.gz
scala-f54e15370e7e90aa303103c8d3aadb22d0164b10.tar.bz2
scala-f54e15370e7e90aa303103c8d3aadb22d0164b10.zip
Initialization order fix to ijuma's serializati...
Initialization order fix to ijuma's serialization patch.
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/collection/immutable/HashMap.scala4
-rw-r--r--src/library/scala/collection/immutable/HashSet.scala4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/library/scala/collection/immutable/HashMap.scala b/src/library/scala/collection/immutable/HashMap.scala
index 7825d62527..7c3ced1f3e 100644
--- a/src/library/scala/collection/immutable/HashMap.scala
+++ b/src/library/scala/collection/immutable/HashMap.scala
@@ -129,8 +129,8 @@ class HashMap[A, +B] extends Map[A,B] with MapLike[A, B, HashMap[A, B]] with mut
later = new HashMap[A, B] {
override def initialSize = 0
/* We need to do this to avoid a reference to the outer HashMap */
- _loadFactor = lf
- override def loadFactor = _loadFactor
+ def _newLoadFactor = lf
+ override def loadFactor = _newLoadFactor
table = HashMap.this.table
tableSize = HashMap.this.tableSize
threshold = HashMap.this.threshold
diff --git a/src/library/scala/collection/immutable/HashSet.scala b/src/library/scala/collection/immutable/HashSet.scala
index 0ad6e156a2..200120b845 100644
--- a/src/library/scala/collection/immutable/HashSet.scala
+++ b/src/library/scala/collection/immutable/HashSet.scala
@@ -103,8 +103,8 @@ class HashSet[A] extends Set[A]
later = new HashSet[A] {
override def initialSize = 0
/* We need to do this to avoid a reference to the outer HashMap */
- _loadFactor = lf
- override def loadFactor = _loadFactor
+ def _newLoadFactor = lf
+ override def loadFactor = _newLoadFactor
table = HashSet.this.table
tableSize = HashSet.this.tableSize
threshold = HashSet.this.threshold