Author: markt
Date: Sat Jul 2 11:45:44 2011
New Revision: 1142206
URL: http://svn.apache.org/viewvc?rev=1142206&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51162
Prevent possible NPE when removing a web application
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1142206&r1=1142205&r2=1142206&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jul 2 11:45:44 2011
@@ -220,12 +220,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko, kfujino
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51162
- Prevent possible NPE when removing a web application
- https://issues.apache.org/bugzilla/attachment.cgi?id=27228&action=edit
- +1: markt, kkolinko, kfujino
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51206
Make CATALINA_BASE visible to setenv.[sh|bat]
http://svn.apache.org/viewvc?rev=1137862&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1142206&r1=1142205&r2=1142206&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Sat
Jul 2 11:45:44 2011
@@ -1214,11 +1214,13 @@ public class HostConfig
log.warn(sm.getString
("hostConfig.context.remove", app.name), t);
}
- try {
- context.destroy();
- } catch (Throwable t) {
- log.warn(sm.getString
- ("hostConfig.context.destroy", app.name), t);
+ if (context != null) {
+ try {
+ context.destroy();
+ } catch (Throwable t) {
+ log.warn(sm.getString
+ ("hostConfig.context.destroy", app.name), t);
+ }
}
// Delete all redeploy resources
for (int j = i + 1; j < resources.length; j++) {
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1142206&r1=1142205&r2=1142206&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Jul 2 11:45:44 2011
@@ -115,6 +115,10 @@
than as a String. (markt)
</fix>
<fix>
+ <bug>51162</bug>: Prevent possible NPE when removing a web application.
+ (markt)
+ </fix>
+ <fix>
<bug>51249</bug>: Improve system property replacement code
in ClassLoaderLogManager of Tomcat JULI to cover some corner cases.
(kkolinko)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
