summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAleksandar Prokopec <axel22@gmail.com>2013-05-30 14:37:01 +0200
committerJason Zaugg <jzaugg@gmail.com>2013-06-09 15:40:54 -0400
commitc71fa58a35690672bc4626d18b5016b98bfcc5f8 (patch)
treec00283863cc4b713db2dcc1aa3e583341cd28780 /src
parente3c318649c4318412c8d7e3cbee4689489f6ccb1 (diff)
downloadscala-c71fa58a35690672bc4626d18b5016b98bfcc5f8.tar.gz
scala-c71fa58a35690672bc4626d18b5016b98bfcc5f8.tar.bz2
scala-c71fa58a35690672bc4626d18b5016b98bfcc5f8.zip
[backport] SI-7498 ParTrieMap.foreach no longer crashes
Previously, the `split` method of the `ParTrieMap` iterator threw an exception when splitting a splitter that iterated over nodes whose hash codes collide. This was due to reusing the iterator of the list of colliding keys rather than creating a new splitter. This commit changes the `subdivide` method to create a new iterator using the factory method of the current trie map iterator rather than returning a `LinearSeqLike` iterator.
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/collection/concurrent/TrieMap.scala7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/library/scala/collection/concurrent/TrieMap.scala b/src/library/scala/collection/concurrent/TrieMap.scala
index 6c11c5bcb5..714260fa8a 100644
--- a/src/library/scala/collection/concurrent/TrieMap.scala
+++ b/src/library/scala/collection/concurrent/TrieMap.scala
@@ -1011,8 +1011,11 @@ private[collection] class TrieMapIterator[K, V](var level: Int, private var ct:
*/
protected def subdivide(): Seq[Iterator[(K, V)]] = if (subiter ne null) {
// the case where an LNode is being iterated
- val it = subiter
- subiter = null
+ val it = newIterator(level + 1, ct, _mustInit = false)
+ it.depth = -1
+ it.subiter = this.subiter
+ it.current = null
+ this.subiter = null
advance()
this.level += 1
Seq(it, this)