diff options
| author | Paul Phillips <paulp@improving.org> | 2010-11-11 05:20:39 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-11-11 05:20:39 +0000 |
| commit | b95246f152347fad32630ad7dc251750b3c4ae47 (patch) | |
| tree | 927361f7ef51b8e879cc66839225ce328697758c | |
| parent | 19b12e8e0fa68ae922cfbc405815698859e106f0 (diff) | |
| download | scala-b95246f152347fad32630ad7dc251750b3c4ae47.tar.gz scala-b95246f152347fad32630ad7dc251750b3c4ae47.tar.bz2 scala-b95246f152347fad32630ad7dc251750b3c4ae47.zip | |
Some minor fixes found by findbugs. No review.
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/Trees.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/collection/JavaConversions.scala | 3 | ||||
| -rw-r--r-- | src/library/scala/collection/mutable/History.scala | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/Trees.scala b/src/compiler/scala/tools/nsc/ast/Trees.scala index 1d914aa414..0deb6c6d47 100644 --- a/src/compiler/scala/tools/nsc/ast/Trees.scala +++ b/src/compiler/scala/tools/nsc/ast/Trees.scala @@ -95,7 +95,7 @@ trait Trees extends reflect.generic.Trees { self: SymbolTable => case (xs: List[_], ys: List[_]) => (xs corresponds ys)(equals0) case _ => this0 == that0 } - def compareOriginals() = (this, that) match { + def compareOriginals() = (tree, that) match { case (x: TypeTree, y: TypeTree) if x.original != null && y.original != null => (x.original equalsStructure0 y.original)(f) case _ => 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 } |