summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McDirmid <sean.mcdirmid@gmail.com>2008-03-16 16:35:46 +0000
committerSean McDirmid <sean.mcdirmid@gmail.com>2008-03-16 16:35:46 +0000
commit06b17eb97ffb0a70a8ccbc2483cc5b7c2083fd11 (patch)
tree62e1609d40882f3d898696de435eb6ece6188e88
parenta480c3afdb3e1bb1354b21fcc8e8c077d0170a80 (diff)
downloadscala-06b17eb97ffb0a70a8ccbc2483cc5b7c2083fd11.tar.gz
scala-06b17eb97ffb0a70a8ccbc2483cc5b7c2083fd11.tar.bz2
scala-06b17eb97ffb0a70a8ccbc2483cc5b7c2083fd11.zip
fix for bug #639
-rw-r--r--src/compiler/scala/tools/nsc/io/ZipArchive.scala5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/io/ZipArchive.scala b/src/compiler/scala/tools/nsc/io/ZipArchive.scala
index 50c783857d..97a8e0d5ec 100644
--- a/src/compiler/scala/tools/nsc/io/ZipArchive.scala
+++ b/src/compiler/scala/tools/nsc/io/ZipArchive.scala
@@ -160,6 +160,11 @@ final class ZipArchive(file: File, val archive: ZipFile) extends PlainFile(file)
final override def path = ZipArchive.this.toString() + "(" + pathInArchive + ")"
final def getArchive = ZipArchive.this.archive
def pathInArchive = super.path
+ override def hashCode = super.hashCode + container.hashCode
+ override def equals(that : Any) = super.equals(that) && (that match {
+ case entry : Entry => container == entry.container
+ case _ => false
+ })
}
//########################################################################