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 09:34:05 UTC
svn commit: r1311615 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java
Author: rmannibucau
Date: Tue Apr 10 07:34:05 2012
New Revision: 1311615
URL: http://svn.apache.org/viewvc?rev=1311615&view=rev
Log:
skipping dynamic mbean when annotation are not available (OSGi for instance)
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=1311615&r1=1311614&r2=1311615&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:34:05 2012
@@ -40,6 +40,14 @@ public class MBeanDeployer implements Dy
logger.debug("looking for annotated MBeans in " + appModule.getModuleId());
final List<String> done = new ArrayList<String>();
+ try { // for OSGi environment, javax.management is imported by the JRE
+ appModule.getClassLoader().loadClass("javax.management.MBean");
+ } catch (NoClassDefFoundError noClassDefFoundError) {
+ return appModule;
+ } catch (ClassNotFoundException e) {
+ return appModule;
+ }
+
// there is an ejbmodule by webapp so we should't need to go through the webapp
for (EjbModule ejbModule : appModule.getEjbModules()) {