Author: markt
Date: Thu Mar 27 20:11:34 2014
New Revision: 1582454
URL: http://svn.apache.org/r1582454
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56321
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.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1582453
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=1582454&r1=1582453&r2=1582454&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 Thu
Mar 27 20:11:34 2014
@@ -1402,8 +1402,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/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1582454&r1=1582453&r2=1582454&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar 27 20:11:34 2014
@@ -66,6 +66,13 @@
decoder provided by Java. Java 8's decoder is better than Java
7's but it is still buggy. (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
