cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Jar.java

[bodewig]

bodewig     01/08/09 23:08:12

  Modified:    src/main/org/apache/tools/ant/taskdefs Tag: ANT_14_BRANCH
                        Jar.java
  Log:
  <jar> would always rejar the archive if no manifest had been specified.
  
  PR: 3067
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.21.2.1  +3 -0      
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jar.java
  
  Index: Jar.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jar.java,v
  retrieving revision 1.21
  retrieving revision 1.21.2.1
  diff -u -r1.21 -r1.21.2.1
  --- Jar.java  2001/08/01 12:56:23     1.21
  +++ Jar.java  2001/08/10 06:08:12     1.21.2.1
  @@ -282,6 +282,9 @@
                       return false;
                   }
                   Manifest currentManifest = new 
Manifest(theZipFile.getInputStream(entry));
  +                if (manifest == null) {
  +                    manifest = getDefaultManifest();
  +                }
                   if (!currentManifest.equals(manifest)) {
                       return false;
                   }