Merge branch '1.9.x'

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

@@ -592,10 +592,10 @@ public class Zip extends MatchingTask {
     /**
      * Set all stored file modification times to {@code time}.
      * @param time Milliseconds since 1970-01-01 00:00, or
-     *        <code>YYYY-MM-DD{T/ }HH:MM[:SS[.SSS]][ ][±ZZ[[:]ZZ]]</code>, or
+     *        <code>YYYY-MM-DD{T/ }HH:MM[:SS[.SSS]][ ][\u00b1ZZ[[:]ZZ]]</code>, or
      *        <code>MM/DD/YYYY HH:MM[:SS] {AM/PM}</code>, where {a/b} indicates
      *        that you must choose one of a or b, and [c] indicates that you
-     *        may use or omit c. ±ZZZZ is the timezone offset, and may be
+     *        may use or omit c. \u00b1ZZZZ is the timezone offset, and may be
      *        literally "Z" to mean GMT.
      * @since Ant 1.10.2
      */
@@ -1909,6 +1909,8 @@ public class Zip extends MatchingTask {
             zipFile(bIn, zOut, vPath,
                     file.lastModified() + (roundUp ? ROUNDUP_MILLIS : 0),
                     null, mode);
+        } finally {
+            bIn.close();
         }
     }
 

src/main/org/apache/tools/ant/taskdefs/launcher/VmsCommandLauncher.java

@@ -134,4 +134,4 @@ public class VmsCommandLauncher extends Java13CommandLauncher {
             }
         }.start();
     }
-}
+}

src/main/org/apache/tools/ant/util/ReflectUtil.java

@@ -213,4 +213,4 @@ public class ReflectUtil {
             throw toBuildException(t);
         }
     }
-}
+}