Author: markt
Date: Thu Mar 27 20:10:31 2014
New Revision: 1582453
URL: http://svn.apache.org/r1582453
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56321
hen a WAR is modified, undeploy the web application before deleting any
expanded directory as the undeploy process may refer to classes that need to be
loaded from the expanded directory. If the expanded directory is deleted first,
any attempt to load a new class during undeploy will fail.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1582453&r1=1582452&r2=1582453&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Thu Mar 27
20:10:31 2014
@@ -1227,8 +1227,8 @@ public class HostConfig
} else {
// Everything else triggers a redeploy
// (just need to undeploy here, deploy will follow)
- deleteRedeployResources(app, resources, i, false);
undeploy(app);
+ deleteRedeployResources(app, resources, i, false);
return;
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1582453&r1=1582452&r2=1582453&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar 27 20:10:31 2014
@@ -63,6 +63,13 @@
<bug>56320</bug>: Fix a file descriptor leak in the default servlet
when
sendfile is used. (markt)
</fix>
+ <fix>
+ <bug>56321</bug>: When a WAR is modified, undeploy the web application
+ before deleting any expanded directory as the undeploy process may
+ refer to classes that need to be loaded from the expanded directory. If
+ the expanded directory is deleted first, any attempt to load a new
class
+ during undeploy will fail. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
