diff --git a/src/main/org/apache/tools/ant/types/TarScanner.java b/src/main/org/apache/tools/ant/types/TarScanner.java index 2690fef91..5eb0d6869 100755 --- a/src/main/org/apache/tools/ant/types/TarScanner.java +++ b/src/main/org/apache/tools/ant/types/TarScanner.java @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.resources.TarResource; +import org.apache.tools.ant.util.FileUtils; import org.apache.tools.tar.TarEntry; import org.apache.tools.tar.TarInputStream; @@ -79,13 +80,7 @@ public class TarScanner extends ArchiveScanner { } catch (IOException ex) { throw new BuildException("problem reading " + srcFile, ex); } finally { - if (ti != null) { - try { - ti.close(); - } catch (IOException ex) { - // swallow - } - } + FileUtils.close(ti); } } -} +} \ No newline at end of file diff --git a/src/main/org/apache/tools/ant/types/ZipScanner.java b/src/main/org/apache/tools/ant/types/ZipScanner.java index 5a70f4376..3795a420c 100644 --- a/src/main/org/apache/tools/ant/types/ZipScanner.java +++ b/src/main/org/apache/tools/ant/types/ZipScanner.java @@ -27,6 +27,7 @@ import java.util.zip.ZipException; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.resources.FileResource; import org.apache.tools.ant.types.resources.ZipResource; +import org.apache.tools.ant.util.FileUtils; import org.apache.tools.zip.ZipEntry; import org.apache.tools.zip.ZipFile; @@ -92,13 +93,7 @@ public class ZipScanner extends ArchiveScanner { } } } finally { - if (zf != null) { - try { - zf.close(); - } catch (IOException ex) { - // swallow - } - } + ZipFile.closeQuietly(zf); } } -} +} \ No newline at end of file