Author: markt
Date: Wed Jul 8 19:21:26 2015
New Revision: 1689941
URL: http://svn.apache.org/r1689941
Log:
Revert r1686635
Modified:
tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java
Modified: tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java?rev=1689941&r1=1689940&r2=1689941&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java Wed Jul 8
19:21:26 2015
@@ -153,7 +153,9 @@ public class DeployTask extends Abstract
throw new BuildException(e);
}
} else {
- try (FileInputStream fsInput = new FileInputStream(war)) {
+ FileInputStream fsInput = null;
+ try {
+ fsInput = new FileInputStream(war);
long size = fsInput.getChannel().size();
if (size > Integer.MAX_VALUE)
@@ -165,6 +167,13 @@ public class DeployTask extends Abstract
stream = new BufferedInputStream(fsInput, 1024);
} catch (IOException e) {
+ if (fsInput != null) {
+ try {
+ fsInput.close();
+ } catch (IOException ioe) {
+ // Ignore
+ }
+ }
throw new BuildException(e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
