[jboss-osgi-commits] JBoss-OSGI SVN: r102516 - projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability.

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

Author: thomas.diesler at jboss.com
Date: 2010-03-17 09:55:06 -0400 (Wed, 17 Mar 2010)
New Revision: 102516

Modified:
   projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/Capability.java
Log:
Prevent stop of already uninstalled capability bundle

Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/Capability.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/Capability.java	2010-03-17 13:21:21 UTC (rev 102515)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/Capability.java	2010-03-17 13:55:06 UTC (rev 102516)
@@ -34,6 +34,7 @@
 import org.jboss.osgi.testing.OSGiBundle;
 import org.jboss.osgi.testing.OSGiRuntime;
 import org.jboss.osgi.testing.OSGiRuntimeHelper;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Version;
 
@@ -229,7 +230,8 @@
 
       for (OSGiBundle bundle : installedReverse)
       {
-         OSGiRuntimeHelper.failsafeStop(bundle);
+         if (bundle.getState() != Bundle.UNINSTALLED)
+            OSGiRuntimeHelper.failsafeStop(bundle);
       }
    }
 
@@ -241,7 +243,8 @@
 
       for (OSGiBundle bundle : installedReverse)
       {
-         OSGiRuntimeHelper.failsafeUninstall(bundle);
+         if (bundle.getState() != Bundle.UNINSTALLED)
+            OSGiRuntimeHelper.failsafeUninstall(bundle);
          installed.remove(bundle);
       }
    }