Author: bodewig
Date: Wed Feb 17 05:09:50 2010
New Revision: 910825
URL: http://svn.apache.org/viewvc?rev=910825&view=rev
Log:
better use the full potential of a Hashtable. PR 48755. Submitted by Marc
Beyand.
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=910825&r1=910824&r2=910825&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Wed Feb 17 05:09:50 2010
@@ -34,6 +34,9 @@
* Ant is now more lenient with ZIP extra fields and will be able to
read archives that it failed to read in earlier versions.
+ * The <zip> family of tasks has been sped up for bigger archives.
+ Bugzilla Report 48755.
+
Changes from Ant 1.8.0RC1 TO Ant 1.8.0
======================================
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java?rev=910825&r1=910824&r2=910825&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java Wed Feb 17
05:09:50 2010
@@ -1723,7 +1723,7 @@
throws IOException {
// fromArchive is used in subclasses overriding this method
- if (entries.contains(vPath)) {
+ if (entries.containsKey(vPath)) {
if (duplicate.equals("preserve")) {
logWhenWriting(vPath + " already added, skipping",