Reviewed Jar (and parts of Zip) because of BR 42632

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@552218 13f79535-47bb-0310-9956-ffa450edef68

src/main/org/apache/tools/ant/taskdefs/Jar.java

@@ -150,10 +150,6 @@ public class Jar extends Zip {
         JarMarker.getInstance()
     };
 
-    // CheckStyle:VisibilityModifier OFF - bc
-    protected String emptyBehavior = "create";
-    // CheckStyle:VisibilityModifier ON
-
     /** constructor */
     public Jar() {
         super();
@@ -456,7 +452,7 @@ public class Jar extends Zip {
         throws IOException {
         for (Enumeration e = manifest.getWarnings();
              e.hasMoreElements();) {
-            log("Manifest warning: " + (String) e.nextElement(),
+            log("Manifest warning: " + e.nextElement(),
                 Project.MSG_WARN);
         }
 
@@ -467,7 +463,7 @@ public class Jar extends Zip {
         OutputStreamWriter osw = new OutputStreamWriter(baos, Manifest.JAR_ENCODING);
         PrintWriter writer = new PrintWriter(osw);
         manifest.write(writer);
-        writer.flush();
+        writer.close();
 
         ByteArrayInputStream bais =
             new ByteArrayInputStream(baos.toByteArray());
@@ -549,7 +545,7 @@ public class Jar extends Zip {
             }
         }
 
-        writer.flush();
+        writer.close();
         ByteArrayInputStream bais =
             new ByteArrayInputStream(baos.toByteArray());
         super.zipFile(bais, zOut, INDEX_NAME, System.currentTimeMillis(), null,

src/main/org/apache/tools/ant/taskdefs/Zip.java

@@ -759,13 +759,16 @@ public class Zip extends MatchingTask {
                         if (keepCompression) {
                             doCompress = (ze.getMethod() == ZipEntry.DEFLATED);
                         }
+                        InputStream is = null;
                         try {
-                            zipFile(zf.getInputStream(ze), zOut, prefix + name,
+                            is = zf.getInputStream(ze);
+                            zipFile(is, zOut, prefix + name,
                                     ze.getTime(), zfs.getSrc(getProject()),
                                     zfs.hasFileModeBeenSet() ? fileMode
                                     : ze.getUnixMode());
                         } finally {
                             doCompress = oldCompress;
+                            FileUtils.close(is);
                         }
                     }
                     } else {