diff options
| author | Rex Kerr <ichoran@gmail.com> | 2014-02-13 16:03:50 -0800 |
|---|---|---|
| committer | Rex Kerr <ichoran@gmail.com> | 2014-02-13 16:03:50 -0800 |
| commit | 040a4e6f5856195d4ab0f8e5f24d49698a138888 (patch) | |
| tree | c1362799343a91086c67efd32b4afa581ca5bcb4 /src | |
| parent | c83e01d47d941265fa5415c0f29a884c904fdfa0 (diff) | |
| download | scala-040a4e6f5856195d4ab0f8e5f24d49698a138888.tar.gz scala-040a4e6f5856195d4ab0f8e5f24d49698a138888.tar.bz2 scala-040a4e6f5856195d4ab0f8e5f24d49698a138888.zip | |
SI-6908 FlatHashTable and things that depend on it can't store nulls
Fixed ParFlatHashTable to use entryToElem which correctly converts sentinels to nulls.
Diffstat (limited to 'src')
| -rw-r--r-- | src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala b/src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala index afc2d6e987..20c792d2ff 100644 --- a/src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala +++ b/src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala @@ -44,7 +44,7 @@ trait ParFlatHashTable[T] extends scala.collection.mutable.FlatHashTable[T] { def remaining = totalsize - traversed def hasNext = traversed < totalsize def next() = if (hasNext) { - val r = itertable(idx).asInstanceOf[T] + val r = entryToElem(itertable(idx)) traversed += 1 idx += 1 if (hasNext) scan() |