You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/04/10 10:00:07 UTC
svn commit: r1311622 -
/openejb/branches/openejb-4.0.0/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java
Author: rmannibucau
Date: Tue Apr 10 08:00:07 2012
New Revision: 1311622
URL: http://svn.apache.org/viewvc?rev=1311622&view=rev
Log:
when testing for MBean annotation trying to use a non null classloader
Modified:
openejb/branches/openejb-4.0.0/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java
Modified: openejb/branches/openejb-4.0.0/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java?rev=1311622&r1=1311621&r2=1311622&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.0/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java (original)
+++ openejb/branches/openejb-4.0.0/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java Tue Apr 10 08:00:07 2012
@@ -40,8 +40,15 @@ public class MBeanDeployer implements Dy
logger.debug("looking for annotated MBeans in " + appModule.getModuleId());
final List<String> done = new ArrayList<String>();
+ ClassLoader cl = appModule.getClassLoader();
+ if (cl == null) {
+ cl = Thread.currentThread().getContextClassLoader();
+ if (cl == null) {
+ cl = getClass().getClassLoader();
+ }
+ }
try { // for OSGi environment, javax.management is imported by the JRE
- appModule.getClassLoader().loadClass("javax.management.MBean");
+ cl.loadClass("javax.management.MBean");
} catch (NoClassDefFoundError noClassDefFoundError) {
return appModule;
} catch (ClassNotFoundException e) {