This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new d557c34 Fix Ant deploy task
d557c34 is described below
commit d557c3437dafa94c59a3b87b28cca9788bbec6d8
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 9ad8ecd..8649610 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 10.0.3 (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>
<add>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
