diff options
| author | Rex Kerr <ichoran@gmail.com> | 2014-02-13 19:37:14 -0800 |
|---|---|---|
| committer | Rex Kerr <ichoran@gmail.com> | 2014-02-14 05:29:36 -0800 |
| commit | a4a13199d0811d01cb008804ae34c594abdc415e (patch) | |
| tree | 3ab9a2a58a80fb0c0e66b665fca83b1a78cae598 /src/library/scala/collection/concurrent | |
| parent | c83e01d47d941265fa5415c0f29a884c904fdfa0 (diff) | |
| download | scala-a4a13199d0811d01cb008804ae34c594abdc415e.tar.gz scala-a4a13199d0811d01cb008804ae34c594abdc415e.tar.bz2 scala-a4a13199d0811d01cb008804ae34c594abdc415e.zip | |
SI-8188 NPE during deserialization of TrieMap
The writer was using the constructor headf and ef instead of the internal vars hashingobj and equalityobj.
Diffstat (limited to 'src/library/scala/collection/concurrent')
| -rw-r--r-- | src/library/scala/collection/concurrent/TrieMap.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/collection/concurrent/TrieMap.scala b/src/library/scala/collection/concurrent/TrieMap.scala index 6632f30e51..fccc1d81b9 100644 --- a/src/library/scala/collection/concurrent/TrieMap.scala +++ b/src/library/scala/collection/concurrent/TrieMap.scala @@ -655,8 +655,8 @@ extends scala.collection.concurrent.Map[K, V] /* internal methods */ private def writeObject(out: java.io.ObjectOutputStream) { - out.writeObject(hashf) - out.writeObject(ef) + out.writeObject(hashingobj) + out.writeObject(equalityobj) val it = iterator while (it.hasNext) { |