[jboss-cvs] JBossAS SVN: r93480 - projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-09-14 10:42:45 -0400 (Mon, 14 Sep 2009)
New Revision: 93480

Modified:
   projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerLocator.java
Log:
Fix NPE when MBeanServer is already registered as service

Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerLocator.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerLocator.java	2009-09-14 14:34:45 UTC (rev 93479)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerLocator.java	2009-09-14 14:42:45 UTC (rev 93480)
@@ -39,20 +39,25 @@
  * @author thomas.diesler at jboss.com
  * @since 24-Apr-2009
  */
-public class MBeanServerLocator 
+public class MBeanServerLocator
 {
    private LogService log;
    private MBeanServer mbeanServer;
-   
+
    @SuppressWarnings("unchecked")
    public MBeanServerLocator(BundleContext context)
    {
       log = new LogServiceTracker(context);
-      
+
       // Check if there is an MBeanServer service already
       ServiceReference sref = context.getServiceReference(MBeanServer.class.getName());
-      if (sref == null)
+      if (sref != null)
       {
+         mbeanServer = (MBeanServer)context.getService(sref);
+         log.log(LogService.LOG_DEBUG, "Found MBeanServer fom service: " + mbeanServer.getDefaultDomain());
+      }
+      else
+      {
          ArrayList<MBeanServer> serverArr = MBeanServerFactory.findMBeanServer(null);
          if (serverArr.size() > 1)
             throw new IllegalStateException("Multiple MBeanServer instances not supported");