Repository: ant Updated Branches: refs/heads/master d3a67a363 -> f7f58eeec
even more FileUtils.close and try-with-resources cases Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/0906b0ad Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/0906b0ad Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/0906b0ad Branch: refs/heads/master Commit: 0906b0ad946dfea4732e15bfa389d3deec1be63d Parents: d3a67a3 Author: Stefan Bodewig <[email protected]> Authored: Tue Mar 29 10:50:07 2016 +0200 Committer: Stefan Bodewig <[email protected]> Committed: Tue Mar 29 10:50:07 2016 +0200 ---------------------------------------------------------------------- src/main/org/apache/tools/ant/AntClassLoader.java | 7 +------ .../org/apache/tools/ant/taskdefs/LogStreamHandler.java | 10 +++------- src/main/org/apache/tools/ant/taskdefs/SQLExec.java | 12 ++---------- .../org/apache/tools/ant/taskdefs/condition/Socket.java | 9 ++------- .../ant/taskdefs/cvslib/RedirectingStreamHandler.java | 10 +++------- .../apache/tools/ant/util/depend/AbstractAnalyzer.java | 8 +------- 6 files changed, 12 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/0906b0ad/src/main/org/apache/tools/ant/AntClassLoader.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java index 61cacce..103b118 100644 --- a/src/main/org/apache/tools/ant/AntClassLoader.java +++ b/src/main/org/apache/tools/ant/AntClassLoader.java @@ -1407,12 +1407,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener { */ public synchronized void cleanup() { for (final Enumeration<JarFile> e = jarFiles.elements(); e.hasMoreElements();) { - final JarFile jarFile = e.nextElement(); - try { - jarFile.close(); - } catch (final IOException ioe) { - // ignore - } + FileUtils.close(e.nextElement()); } jarFiles = new Hashtable<File, JarFile>(); if (project != null) { http://git-wip-us.apache.org/repos/asf/ant/blob/0906b0ad/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java index ed16cf3..bc69c06 100644 --- a/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java @@ -23,6 +23,7 @@ import java.io.IOException; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.Task; +import org.apache.tools.ant.util.FileUtils; /** * Logs standard output and error of a subprocess to the log system of ant. @@ -59,12 +60,7 @@ public class LogStreamHandler extends PumpStreamHandler { */ public void stop() { super.stop(); - try { - getErr().close(); - getOut().close(); - } catch (IOException e) { - // plain impossible - throw new BuildException(e); - } + FileUtils.close(getErr()); + FileUtils.close(getOut()); } } http://git-wip-us.apache.org/repos/asf/ant/blob/0906b0ad/src/main/org/apache/tools/ant/taskdefs/SQLExec.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java index 6debd6d..c4076bc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java +++ b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java @@ -692,19 +692,11 @@ public class SQLExec extends JDBCTask { } } finally { try { - if (getStatement() != null) { - getStatement().close(); - } - } catch (SQLException ex) { - // ignore - } - try { - if (getConnection() != null) { - getConnection().close(); - } + FileUtils.close(getStatement()); } catch (SQLException ex) { // ignore } + FileUtils.close(getConnection()); } log(goodSql + " of " + totalSql + " SQL statements executed successfully"); http://git-wip-us.apache.org/repos/asf/ant/blob/0906b0ad/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java b/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java index d6a69ec..43a40e0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java @@ -23,6 +23,7 @@ import java.io.IOException; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectComponent; +import org.apache.tools.ant.util.FileUtils; /** * Condition to wait for a TCP/IP socket to have a listener. Its attributes are: @@ -73,13 +74,7 @@ public class Socket extends ProjectComponent implements Condition { } catch (IOException e) { return false; } finally { - if (s != null) { - try { - s.close(); - } catch (IOException ioe) { - // Intentionally left blank - } - } + FileUtils.close(s); } return true; } http://git-wip-us.apache.org/repos/asf/ant/blob/0906b0ad/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java index 713de0c..e9b755d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java @@ -22,6 +22,7 @@ import java.io.IOException; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.PumpStreamHandler; +import org.apache.tools.ant.util.FileUtils; /** * A dummy stream handler that just passes stuff to the parser. @@ -49,13 +50,8 @@ class RedirectingStreamHandler public void stop() { super.stop(); - try { - getErr().close(); - getOut().close(); - } catch (final IOException e) { - // plain impossible - throw new BuildException(e); - } + FileUtils.close(getErr()); + FileUtils.close(getOut()); } } http://git-wip-us.apache.org/repos/asf/ant/blob/0906b0ad/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java index 5c95d75..eb5f97a 100644 --- a/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java +++ b/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java @@ -267,16 +267,10 @@ public abstract class AbstractAnalyzer implements DependencyAnalyzer { } } else { // must be a zip of some sort - ZipFile zipFile = null; - try { - zipFile = new ZipFile(element); + try (ZipFile zipFile = new ZipFile(element)) { if (zipFile.getEntry(resourceLocation) != null) { return element; } - } finally { - if (zipFile != null) { - zipFile.close(); - } } } }
