Fix concurrent.Map#{filterInPlace,mapValuesInPlace}

Fix the behaviour of `concurrent.Map#filterInPlace` and `concurrent.Map#mapValuesInPlace` to respect atomic entry changes.

Author: NthPortal

library/src/scala/collection/concurrent/Map.scala

@@ -131,4 +131,22 @@ trait Map[K, V] extends scala.collection.mutable.Map[K, V] {
  case _ => this.updateWithAux(key)(remappingFunction)
  }
  }
+
+ private[collection] def filterInPlaceImpl(p: (K, V) => Boolean): this.type = {
+ val it = iterator
+ while (it.hasNext) {
+ val (k, v) = it.next()
+ if (p(k, v)) remove(k, v)
+ }
+ this
+ }
+
+ private[collection] def mapValuesInPlaceImpl(f: (K, V) => V): this.type = {
+ val it = iterator
+ while (it.hasNext) {
+ val (k, v) = it.next()
+ replace(k, v, f(k, v))
+ }
+ this
+ }
 }

library/src/scala/collection/concurrent/TrieMap.scala

@@ -153,7 +153,7 @@ private[collection] final class INode[K, V](bn: MainNode[K, V], g: Gen, equiv: E
  * KEY_ABSENT - key wasn't there, insert only, do not overwrite
  * KEY_PRESENT - key was there, overwrite only, do not insert
  * other value `v` - only overwrite if the current value is this
- * @param hc the hashcode of `k``
+ * @param hc the hashcode of `k`
  *
  * @return null if unsuccessful, Option[V] otherwise (indicating previous value bound to the key)
  */

library/src/scala/collection/mutable/Map.scala

@@ -171,17 +171,19 @@ trait MapOps[K, V, +CC[X, Y] <: MapOps[X, Y, CC, _], +C <: MapOps[K, V, CC, C]]
  * @param p The test predicate
  */
  def filterInPlace(p: (K, V) => Boolean): this.type = {
- if (nonEmpty) {
- val array = this.toArray[Any] // scala/bug#7269 toArray avoids ConcurrentModificationException
- val arrayLength = array.length
- var i = 0
- while (i < arrayLength) {
- val (k, v) = array(i).asInstanceOf[(K, V)]
- if (!p(k, v)) {
- this -= k
+ if (!isEmpty) this match {
+ case tm: concurrent.Map[_, _] => tm.asInstanceOf[concurrent.Map[K, V]].filterInPlaceImpl(p)
+ case _ =>
+ val array = this.toArray[Any] // scala/bug#7269 toArray avoids ConcurrentModificationException
+ val arrayLength = array.length
+ var i = 0
+ while (i < arrayLength) {
+ val (k, v) = array(i).asInstanceOf[(K, V)]
+ if (!p(k, v)) {
+ this -= k
+ }
+ i += 1
  }
- i += 1
- }
  }
  this
  }
@@ -197,8 +199,9 @@ trait MapOps[K, V, +CC[X, Y] <: MapOps[X, Y, CC, _], +C <: MapOps[K, V, CC, C]]
  * @return the map itself.
  */
  def mapValuesInPlace(f: (K, V) => V): this.type = {
- if (nonEmpty) this match {
+ if (!isEmpty) this match {
  case hm: mutable.HashMap[_, _] => hm.asInstanceOf[mutable.HashMap[K, V]].mapValuesInPlaceImpl(f)
+ case tm: concurrent.Map[_, _] => tm.asInstanceOf[concurrent.Map[K, V]].mapValuesInPlaceImpl(f)
  case _ =>
  val array = this.toArray[Any]
  val arrayLength = array.length