amyroh 2004/04/27 19:02:46
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
ResourceUtils.java
Log:
Fix for 28524 - "Exception throw when creating new JNDI data source."
Revision Changes Path
1.9 +11 -2
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
Index: ResourceUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ResourceUtils.java 27 Feb 2004 14:59:04 -0000 1.8
+++ ResourceUtils.java 28 Apr 2004 02:02:46 -0000 1.9
@@ -22,10 +22,12 @@
import java.util.Iterator;
import java.util.Collections;
+import javax.management.AttributeNotFoundException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.ObjectInstance;
+
/**
* <p>Shared utility methods for the resource administration module.</p>
*
@@ -197,7 +199,14 @@
while (iterator.hasNext()) {
ObjectInstance instance = (ObjectInstance) iterator.next();
- results.add(instance.getObjectName().toString());
+ ObjectName oname = instance.getObjectName();
+ try {
+ // only add resource mbean if definition exists
+ mserver.getAttribute(oname, "driverClassName");
+ results.add(instance.getObjectName().toString());
+ } catch (AttributeNotFoundException ex) {
+ // full resource definition doesn't exist
+ }
}
Collections.sort(results);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
