Author: rmannibucau
Date: Tue Apr 10 07:59:56 2012
New Revision: 1311621
URL: http://svn.apache.org/viewvc?rev=1311621&view=rev
Log:
when testing for MBean annotation trying to use a non null classloader
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java?rev=1311621&r1=1311620&r2=1311621&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java
Tue Apr 10 07:59:56 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) {
