diff options
| author | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-11-02 00:15:16 +0000 |
|---|---|---|
| committer | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-11-02 00:15:16 +0000 |
| commit | bcfe76ee680852c66781882d70ac02bd76e09ac9 (patch) | |
| tree | 72d8a56d40bec04f0290a9909a6cff384d1ff4fb /src/library/scala/collection/mutable/LinkedHashMap.scala | |
| parent | b80f27780458da880d47392e4ac747d196af355e (diff) | |
| download | scala-bcfe76ee680852c66781882d70ac02bd76e09ac9.tar.gz scala-bcfe76ee680852c66781882d70ac02bd76e09ac9.tar.bz2 scala-bcfe76ee680852c66781882d70ac02bd76e09ac9.zip | |
Added separate bitmaps for private and transien...
Added separate bitmaps for private and transient lazy vals. Closes
#3038, #1573. Review by dragos. I had to fix a couple of initialization
issues that checkinit forced me to do and that weren't a problem before
because the bitmap was serialized even for @transitive. For that I
needed to change the setters in checkinit so that they also update the
bitmap.
Diffstat (limited to 'src/library/scala/collection/mutable/LinkedHashMap.scala')
| -rw-r--r-- | src/library/scala/collection/mutable/LinkedHashMap.scala | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/library/scala/collection/mutable/LinkedHashMap.scala b/src/library/scala/collection/mutable/LinkedHashMap.scala index 203adcc966..f52aebed81 100644 --- a/src/library/scala/collection/mutable/LinkedHashMap.scala +++ b/src/library/scala/collection/mutable/LinkedHashMap.scala @@ -140,6 +140,8 @@ class LinkedHashMap[A, B] extends Map[A, B] } private def readObject(in: java.io.ObjectInputStream) { + firstEntry = null + lastEntry = null init[B](in, { (key, value) => val entry = new Entry(key, value) updateLinkedEntries(entry) |