Browse Source

performance enhancement, without this getNonFilesetResourcesToAdd might get invoked twice if the manifest changes

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@349646 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 20 years ago
parent
commit
7ac5356019
1 changed files with 4 additions and 3 deletions
  1. +4
    -3
      src/main/org/apache/tools/ant/taskdefs/Jar.java

+ 4
- 3
src/main/org/apache/tools/ant/taskdefs/Jar.java View File

@@ -46,6 +46,7 @@ import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.EnumeratedAttribute;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.ResourceCollection;
import org.apache.tools.ant.types.ZipFileSet;
import org.apache.tools.zip.JarMarker;
import org.apache.tools.zip.ZipExtraField;
@@ -633,7 +634,7 @@ public class Jar extends Zip {
* third arg if they already know that the archive is
* out-of-date.</p>
*
* @param filesets The filesets to grab resources from
* @param rcs The resource collections to grab resources from
* @param zipFile intended archive file (may or may not exist)
* @param needsUpdate whether we already know that the archive is
* out-of-date. Subclasses overriding this method are supposed to
@@ -644,7 +645,7 @@ public class Jar extends Zip {
*
* @exception BuildException if it likes
*/
protected ArchiveState getResourcesToAdd(FileSet[] filesets,
protected ArchiveState getResourcesToAdd(ResourceCollection[] rcs,
File zipFile,
boolean needsUpdate)
throws BuildException {
@@ -680,7 +681,7 @@ public class Jar extends Zip {
}

createEmpty = needsUpdate;
return super.getResourcesToAdd(filesets, zipFile, needsUpdate);
return super.getResourcesToAdd(rcs, zipFile, needsUpdate);
}

/**


Loading…
Cancel
Save