Some minor fixes found by findbugs. No review.

2 files changed, 3 insertions, 1 deletions

diff --git a/src/library/scala/collection/JavaConversions.scala b/src/library/scala/collection/JavaConversions.scala
index 5d89503373..1a223f8095 100644
--- a/src/library/scala/collection/JavaConversions.scala
+++ b/src/library/scala/collection/JavaConversions.scala
@@ -701,7 +701,8 @@ object JavaConversions {
             def getKey = k
             def getValue = v
             def setValue(v1 : B) = self.put(k, v1)
-            override def equals(other : Any) = other match {
+            override def hashCode = k.hashCode + v.hashCode
+            override def equals(other: Any) = other match {
               case e : ju.Map.Entry[_, _] => k == e.getKey && v == e.getValue
               case _ => false
             }
diff --git a/src/library/scala/collection/mutable/History.scala b/src/library/scala/collection/mutable/History.scala
index d480c4342b..4a48f5c12c 100644
--- a/src/library/scala/collection/mutable/History.scala
+++ b/src/library/scala/collection/mutable/History.scala
@@ -57,4 +57,5 @@ class History[Evt, Pub] extends Subscriber[Evt, Pub] with Iterable[(Pub, Evt)]
     case that: History[_, _] => this.log equals that.log
     case _                   => false
   }
+  override def hashCode = log.hashCode
 }