Return-Path: Delivered-To: apmail-incubator-geronimo-cvs-archive@www.apache.org Received: (qmail 71739 invoked from network); 28 Dec 2003 19:29:00 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 28 Dec 2003 19:29:00 -0000 Received: (qmail 96037 invoked by uid 500); 28 Dec 2003 19:28:50 -0000 Delivered-To: apmail-incubator-geronimo-cvs-archive@incubator.apache.org Received: (qmail 95928 invoked by uid 500); 28 Dec 2003 19:28:49 -0000 Mailing-List: contact geronimo-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: geronimo-dev@incubator.apache.org Delivered-To: mailing list geronimo-cvs@incubator.apache.org Received: (qmail 95913 invoked from network); 28 Dec 2003 19:28:49 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 28 Dec 2003 19:28:49 -0000 Received: (qmail 71726 invoked by uid 1712); 28 Dec 2003 19:28:58 -0000 Date: 28 Dec 2003 19:28:58 -0000 Message-ID: <20031228192858.71725.qmail@minotaur.apache.org> From: djencks@apache.org To: incubator-geronimo-cvs@apache.org Subject: cvs commit: incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service GeronimoMBean.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N djencks 2003/12/28 11:28:58 Modified: modules/kernel/src/java/org/apache/geronimo/kernel/deployment/task DeployGeronimoMBean.java modules/kernel/src/java/org/apache/geronimo/kernel/service GeronimoMBean.java Log: Make problems with getGeronimoMBeanInfo methods more visible Revision Changes Path 1.9 +2 -2 incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/task/DeployGeronimoMBean.java Index: DeployGeronimoMBean.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/task/DeployGeronimoMBean.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- DeployGeronimoMBean.java 18 Nov 2003 02:19:37 -0000 1.8 +++ DeployGeronimoMBean.java 28 Dec 2003 19:28:58 -0000 1.9 @@ -124,7 +124,7 @@ try { metadata.setGeronimoMBeanInfo(GeronimoMBean.getGeronimoMBeanInfo(metadata.getGeronimoMBeanDescriptor())); } catch (Exception e) { - //ignore + log.trace("Failed to obtain coded GeronimoMBeanInfo", e); } } GeronimoMBean mbean = new GeronimoMBean(); 1.10 +13 -4 incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/GeronimoMBean.java Index: GeronimoMBean.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/GeronimoMBean.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- GeronimoMBean.java 17 Nov 2003 07:33:51 -0000 1.9 +++ GeronimoMBean.java 28 Dec 2003 19:28:58 -0000 1.10 @@ -112,7 +112,7 @@ this.mbeanInfo = mbeanInfo; } /** - * Static helper to try to gett the GeronimoMBeanInfo from the class supplied. + * Static helper to try to get the GeronimoMBeanInfo from the class supplied. * @param className * @return GeronimoMBeanInfo generated by supplied class * @throws Exception @@ -122,9 +122,18 @@ if (cl == null) { cl = ClassLoader.getSystemClassLoader(); } - Class clazz = cl.loadClass(className); + Class clazz = null; + try { + clazz = cl.loadClass(className); + } catch (ClassNotFoundException e) { + //Most likely, descriptor was an xml file, not a class name. + return null; + } Method m = clazz.getDeclaredMethod("getGeronimoMBeanInfo", new Class[] {}); - return (GeronimoMBeanInfo)m.invoke(clazz, new Object[] {}); + if (m != null) { + return (GeronimoMBeanInfo)m.invoke(clazz, new Object[] {}); + } + return null; } /**