Author: markt
Date: Wed Mar 3 23:42:33 2010
New Revision: 918779
URL: http://svn.apache.org/viewvc?rev=918779&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48686
Fix NPE in host delete
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=918779&r1=918778&r2=918779&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar 3 23:42:33 2010
@@ -113,12 +113,6 @@
+1: kkolinko, rjung
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48686
- Fix NPE in host delete
- https://issues.apache.org/bugzilla/attachment.cgi?id=24966
- +1: markt, kkolinko, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48582
Avoid NPE on background compile
http://svn.apache.org/viewvc?rev=910471&view=rev
Modified:
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java?rev=918779&r1=918778&r2=918779&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java
(original)
+++
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java
Wed Mar 3 23:42:33 2010
@@ -113,7 +113,7 @@
// this host cannot be deleted from the admin tool
try {
adminHost = Lists.getAdminAppHost(
- mBServer, "domain" ,request);
+ mBServer, domain ,request);
} catch (Exception e) {
String message =
resources.getMessage(locale, "error.hostName.bad",
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=918779&r1=918778&r2=918779&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Mar 3
23:42:33 2010
@@ -278,6 +278,10 @@
in the documentation web application to specify how the defaults for
the
various trust store attributes are determined. (markt)
</add>
+ <fix>
+ <bug>48686</bug>: Fix deleting a host via the Administration web
+ application rather than failign with a HTTP 500 response. (markt)
+ </fix>
<add>
Make changelog.xml be directly rendered as HTML by certain browsers.
(kkolinko)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
