Author: kkolinko
Date: Mon Jan 18 00:04:59 2016
New Revision: 1725156
URL: http://svn.apache.org/viewvc?rev=1725156&view=rev
Log:
Followup to r1725155. Move digester.reset() call even earlier, before closing
the streams.
Streams are local, digester is a shared instance.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1725156&r1=1725155&r2=1725156&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Mon
Jan 18 00:04:59 2016
@@ -938,6 +938,7 @@ public class HostConfig
"hostConfig.deployDescriptor.error",
war.getAbsolutePath()), e);
} finally {
+ digester.reset();
if (istream != null) {
try {
istream.close();
@@ -954,7 +955,6 @@ public class HostConfig
}
jar = null;
}
- digester.reset();
if (context == null) {
context = new FailedContext();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
