Author: markt
Date: Wed Sep 6 19:47:31 2006
New Revision: 440953
URL: http://svn.apache.org/viewvc?view=rev&rev=440953
Log:
Fix bug 31339 when admin webapp threw exceptions if Engine name was not
Catalina.
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java?view=diff&rev=440953&r1=440952&r2=440953
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
Wed Sep 6 19:47:31 2006
@@ -532,9 +532,8 @@
(MBeanServer mbserver, String domain, HttpServletRequest request)
throws Exception {
- String adminDomain = TomcatTreeBuilder.DEFAULT_DOMAIN;
// Get the admin app's service name
- StringBuffer sb = new StringBuffer(adminDomain);
+ StringBuffer sb = new StringBuffer(domain);
sb.append(":type=Service,*");
ObjectName search = new ObjectName(sb.toString());
Iterator names = mbserver.queryNames(search, null).iterator();
@@ -561,8 +560,7 @@
throws Exception {
// Get the admin app's host name
- String adminDomain = TomcatTreeBuilder.DEFAULT_DOMAIN;
- StringBuffer sb = new StringBuffer(adminDomain);
+ StringBuffer sb = new StringBuffer(domain);
sb.append(":j2eeType=WebModule,*");
ObjectName search = new ObjectName(sb.toString());
Iterator names = mbserver.queryNames(search, null).iterator();
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=440953&r1=440952&r2=440953
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Sep 6 19:47:31 2006
@@ -46,6 +46,11 @@
</subsection>
<subsection name="Webapps">
<changelog>
+ <fix>
+ <bug>31339</bug>: Admin app threw exceptions if a name other than
Catalina
+ was configured for the Engine. Patch based on a suggestion from Amila
+ Suriarachchi. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
