This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7c4abfc6760c7d88d38b9a909d911c6a957f5b9f Author: Mark Thomas <[email protected]> AuthorDate: Mon Feb 1 16:34:12 2021 +0000 Fix Ant deploy task Revert an incorrect fix for a potential resource leak that broke deployment via the Ant deploy task. --- java/org/apache/catalina/ant/DeployTask.java | 13 +++++++++++-- webapps/docs/changelog.xml | 8 ++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/ant/DeployTask.java b/java/org/apache/catalina/ant/DeployTask.java index a4c54fc..54cb8a0 100644 --- a/java/org/apache/catalina/ant/DeployTask.java +++ b/java/org/apache/catalina/ant/DeployTask.java @@ -140,11 +140,20 @@ public class DeployTask extends AbstractCatalinaCommandTask { throw new BuildException(e); } } else { - try (FileInputStream fsInput = new FileInputStream(war); - FileChannel fsChannel = fsInput.getChannel()) { + FileInputStream fsInput= null; + try { + fsInput = new FileInputStream(war); + FileChannel fsChannel = fsInput.getChannel(); contentLength = fsChannel.size(); stream = new BufferedInputStream(fsInput, 1024); } catch (IOException e) { + if (fsInput != null) { + try { + fsInput.close(); + } catch (IOException ioe) { + // Ignore + } + } throw new BuildException(e); } } diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b95fd57..c291b79 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,6 +104,14 @@ issues do not "pop up" wrt. others). --> <section name="Tomcat 9.0.44 (markt)" rtext="in development"> + <subsection name="Catalina"> + <changelog> + <fix> + Revert an incorrect fix for a potential resource leak that broke + deployment via the Ant deploy task. (markt) + </fix> + </changelog> + </subsection> <subsection name="Coyote"> <changelog> <fix> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
