[jboss-osgi-commits] JBoss-OSGI SVN: r103310 - projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/packageadmin.

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

Author: adrian at jboss.org
Date: 2010-03-31 07:23:37 -0400 (Wed, 31 Mar 2010)
New Revision: 103310

Modified:
   projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/packageadmin/PackageAdminImpl.java
Log:
[JBDEPLOY-245] - Reset the required stage of the deployment for those bundles that are incomplete

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/packageadmin/PackageAdminImpl.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/packageadmin/PackageAdminImpl.java	2010-03-31 11:17:00 UTC (rev 103309)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/packageadmin/PackageAdminImpl.java	2010-03-31 11:23:37 UTC (rev 103310)
@@ -347,6 +347,18 @@
       {
          log.error("Error resolving bundles: " + resolvableBundles, ex);
          allResolved = false;
+         
+         // Reset the required state for bundles that didn't get resolved
+         for (OSGiBundleState bundleState : resolvableBundles)
+         {
+            if (bundleState.getState() == Bundle.INSTALLED)
+            {
+               DeploymentUnit unit = bundleState.getDeploymentUnit();
+               unit.setRequiredStage(DeploymentStages.DESCRIBE);
+               ControllerContext ctx = unit.getAttachment(ControllerContext.class);
+               ctx.setRequiredState(ControllerState.newState(DeploymentStages.DESCRIBE.getName()));
+            }
+         }
       }
       
       return allResolved;