manveen 2002/06/13 16:38:26
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
ResourceUtils.java
Log:
Set parent and parentType to empty strings (for global resources) . these are not
needed for computing the mBean for the global env entries case.
Revision Changes Path
1.7 +18 -8
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
Index: ResourceUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ResourceUtils.java 13 Jun 2002 23:17:57 -0000 1.6
+++ ResourceUtils.java 13 Jun 2002 23:38:26 -0000 1.7
@@ -111,7 +111,7 @@
ename = new ObjectName( ENVIRONMENT_TYPE +
","+parentType+"=" + parent);
}
-
+
Iterator iterator = (mserver.queryMBeans(ename, null).iterator());
ArrayList results = new ArrayList();
@@ -124,9 +124,19 @@
EnvEntriesForm envEntriesForm = new EnvEntriesForm();
envEntriesForm.setEnvEntries((String[])
- results.toArray(new String[results.size()]));
- envEntriesForm.setParentName(parent);
- envEntriesForm.setParentType(parentType);
+ results.toArray(new String[results.size()]));
+
+ if (parent != null) {
+ envEntriesForm.setParentName(parent);
+ } else {
+ envEntriesForm.setParentName("");
+ }
+
+ if (parentType != null) {
+ envEntriesForm.setParentType(parentType);
+ } else {
+ envEntriesForm.setParentType("");
+ }
return (envEntriesForm);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
