summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRuediger Klaehn <rklaehn@gmail.com>2012-08-20 22:44:37 +0200
committerRuediger Klaehn <rklaehn@gmail.com>2012-08-20 22:44:37 +0200
commit52758c58a0e9661415c2a2506911175367e2e200 (patch)
tree88dc3dfafb13a2eea778806bf83a1ce4a0c5145c /src
parent1e4f765f30fc19947bb2c9f56c0eb47a30685caf (diff)
downloadscala-52758c58a0e9661415c2a2506911175367e2e200.tar.gz
scala-52758c58a0e9661415c2a2506911175367e2e200.tar.bz2
scala-52758c58a0e9661415c2a2506911175367e2e200.zip
Remove unnecessary check for merger eq null
While we still have to check for merger eq null in updated0 because updated0 gets called with a nu
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/collection/immutable/HashMap.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/collection/immutable/HashMap.scala b/src/library/scala/collection/immutable/HashMap.scala
index acb3867cfa..17f8ffd594 100644
--- a/src/library/scala/collection/immutable/HashMap.scala
+++ b/src/library/scala/collection/immutable/HashMap.scala
@@ -221,7 +221,7 @@ object HashMap extends ImmutableMapFactory[HashMap] with BitOperations.Int {
// this method may be called multiple times in a multithreaded environment, but that's ok
private[HashMap] def ensurePair: (A,B) = if (kv ne null) kv else { kv = (key, value); kv }
protected override def merge0[B1 >: B](that: HashMap[A, B1], level: Int, merger: Merger[A, B1]): HashMap[A, B1] = {
- that.updated0(key, hash, level, value, kv, if (merger ne null) merger.invert else null)
+ that.updated0(key, hash, level, value, kv, merger.invert)
}
}
@@ -486,7 +486,7 @@ time { mNew.iterator.foreach( p => ()) }
}
new HashTrieMap[A, B1](this.bitmap | that.bitmap, merged, totalelems)
- case hm: HashMapCollision1[_, _] => that.merge0(this, level, if (merger ne null) merger.invert else null)
+ case hm: HashMapCollision1[_, _] => that.merge0(this, level, merger.invert)
case hm: HashMap[_, _] => this
case _ => sys.error("section supposed to be unreachable.")
}