diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-05-08 23:17:20 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-05-08 23:17:20 +0200 |
| commit | b5392a0f034afe23aff183d8673464c848f76241 (patch) | |
| tree | 78344e4af58b661f2807856cfdcb2534ce92a2af /src | |
| parent | 6dd0a364f775e507f0ffb983311c35f40d1e1939 (diff) | |
| parent | c6b50282ab25c092af21b81080f863f8b44d08dc (diff) | |
| download | scala-b5392a0f034afe23aff183d8673464c848f76241.tar.gz scala-b5392a0f034afe23aff183d8673464c848f76241.tar.bz2 scala-b5392a0f034afe23aff183d8673464c848f76241.zip | |
Merge pull request #3704 from gourlaysama/wip/t8504
SI-8504 fix NPE in the Java wrapper for a Scala Map.
Diffstat (limited to 'src')
| -rw-r--r-- | src/library/scala/collection/convert/Wrappers.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/collection/convert/Wrappers.scala b/src/library/scala/collection/convert/Wrappers.scala index 14ae57c43a..7d1d6b3781 100644 --- a/src/library/scala/collection/convert/Wrappers.scala +++ b/src/library/scala/collection/convert/Wrappers.scala @@ -194,7 +194,7 @@ private[collection] trait Wrappers { def getKey = k def getValue = v def setValue(v1 : B) = self.put(k, v1) - override def hashCode = byteswap32(k.hashCode) + (byteswap32(v.hashCode) << 16) + override def hashCode = byteswap32(k.##) + (byteswap32(v.##) << 16) override def equals(other: Any) = other match { case e: ju.Map.Entry[_, _] => k == e.getKey && v == e.getValue case _ => false |