Browse Source

Reactivate methods disabled in PR 33049.

The equals method was a bit lousy and does not have a real meaning, so I keep it clear that the equals is related to the instance and nothing else. the hashCode method is actually the most important for performance.

I have yet to find a way to unit test it programmatically as I don't understand the Zip task impl. at first glance.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277432 13f79535-47bb-0310-9956-ffa450edef68
master
Stephane Bailliez 20 years ago
parent
commit
71eb2aed78
1 changed files with 12 additions and 13 deletions
  1. +12
    -13
      src/main/org/apache/tools/zip/ZipEntry.java

+ 12
- 13
src/main/org/apache/tools/zip/ZipEntry.java View File

@@ -400,32 +400,31 @@ 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() {
// this method has severe consequences on performance. We cannot rely
// on the super.hashCode() method since super.getName() always return
// the empty string in the current implemention (there's no setter)
// so it is basically draining the performance of a hashmap lookup
return getName().hashCode();
}
*/
/*
* The equality method.

/**
* The equality method. In this case, the implementation returns 'this == o'
* which is basically the equals method of the Object class.
* @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) {
if (o instanceof ZipEntry) {
ZipEntry other = (ZipEntry) o;
return other.getName().equals(getName());
}
return false;
public boolean equals(Object o) {
return (this == o);
}
*/

/**
* Helper for JDK 1.1
*


Loading…
Cancel
Save