diff options
author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-06-06 13:18:05 -0700 |
---|---|---|
committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-06-06 13:18:05 -0700 |
commit | 2023f3d2d95c37e7fff1b367e708bb509516f5d8 (patch) | |
tree | 8eb217fb55c7df7ec21faf9ec6811e68a8f0ce9d /src/library | |
parent | 0cab12a04689a6e062891c293ab5db2374414134 (diff) | |
parent | daca24d8e7050eab9551b123cef010d7bf33f803 (diff) | |
download | scala-2023f3d2d95c37e7fff1b367e708bb509516f5d8.tar.gz scala-2023f3d2d95c37e7fff1b367e708bb509516f5d8.tar.bz2 scala-2023f3d2d95c37e7fff1b367e708bb509516f5d8.zip |
Merge pull request #673 from axel22/issue/5880
Fix SI-5880.
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/collection/convert/Wrappers.scala | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/library/scala/collection/convert/Wrappers.scala b/src/library/scala/collection/convert/Wrappers.scala index b1b48b760f..6c66ac6c4d 100644 --- a/src/library/scala/collection/convert/Wrappers.scala +++ b/src/library/scala/collection/convert/Wrappers.scala @@ -171,7 +171,13 @@ private[collection] trait Wrappers { var prev : Option[A] = None def hasNext = ui.hasNext - + + def improve(hc: Int) = { + var i = hc * 0x9e3775cd + i = java.lang.Integer.reverseBytes(i) + i * 0x9e3775c + } + def next() = { val (k, v) = ui.next prev = Some(k) @@ -179,7 +185,7 @@ private[collection] trait Wrappers { def getKey = k def getValue = v def setValue(v1 : B) = self.put(k, v1) - override def hashCode = k.hashCode + v.hashCode + override def hashCode = improve(k.hashCode) + (improve(v.hashCode) << 16) override def equals(other: Any) = other match { case e: ju.Map.Entry[_, _] => k == e.getKey && v == e.getValue case _ => false |