Browse Source

PR: 33049

A zip entry is not equal to another zip entry when the name matches.
Multiple files may have the same name, and have for instance  different
offsets.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277346 13f79535-47bb-0310-9956-ffa450edef68
master
Jacobus Martinus Kruithof 20 years ago
parent
commit
853a43b951
1 changed files with 8 additions and 6 deletions
  1. +8
    -6
      src/main/org/apache/tools/zip/ZipEntry.java

+ 8
- 6
src/main/org/apache/tools/zip/ZipEntry.java View File

@@ -400,30 +400,32 @@ public class ZipEntry extends java.util.zip.ZipEntry implements Cloneable {
this.name = name;
}

/**
/* Two zipentries are not necessarily equal if they have the same name. */
/*
* Get the hashCode of the entry.
* This uses the name as the hashcode.
* @return a hashcode.
* @since Ant 1.7
*/
public int hashCode() {
/* public int hashCode() {
return getName().hashCode();
}
/**
*/
/*
* The equality method.

* @param o the object to compare to
* @return true if this object has the same name as <code>o</code>
* @since Ant 1.7
*/
public boolean equals(Object o) {
/* public boolean equals(Object o) {
if (o instanceof ZipEntry) {
ZipEntry other = (ZipEntry) o;
return other.getName().equals(getName());
}
return false;
}
*/
/**
* Helper for JDK 1.1
*


Loading…
Cancel
Save