[jboss-osgi-commits] JBoss-OSGI SVN: r102538 - in projects/jboss-osgi/projects: spi/trunk/src/main/java/org/jboss/osgi/testing/internal and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2010-03-17 23:57:37 -0400 (Wed, 17 Mar 2010)
New Revision: 102538

Modified:
   projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java
   projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java
Log:
Prevent NPE on uninstall.
Give JMX more time to register MBeans.

Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java	2010-03-18 00:54:03 UTC (rev 102537)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java	2010-03-18 03:57:37 UTC (rev 102538)
@@ -93,7 +93,7 @@
       ObjectName bndName = ObjectNameFactory.create(BundleStateMBean.OBJECTNAME);
       ObjectName srvName = ObjectNameFactory.create(ServiceStateMBean.OBJECTNAME);
       
-      int timeout = 2000;
+      int timeout = 5000;
       while ( 0 < (timeout -= 200))
       {
          if (server.isRegistered(fwkName) != state || server.isRegistered(bndName) != state || server.isRegistered(srvName) != state)

Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java	2010-03-18 00:54:03 UTC (rev 102537)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java	2010-03-18 03:57:37 UTC (rev 102538)
@@ -339,7 +339,8 @@
 
       String location = bundle.getLocation();
       BundleTuple tuple = bundles.get(location);
-      tuple.uninstall();
+      if (tuple != null)
+         tuple.uninstall();
    }
 
    private VirtualFile toVirtualFile(Archive<?> archive) throws IOException, MalformedURLException