[jboss-cvs] JBossAS SVN: r101392 - projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/packageadmin.

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

Author: thomas.diesler at jboss.com
Date: 2010-02-24 08:04:28 -0500 (Wed, 24 Feb 2010)
New Revision: 101392

Modified:
   projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/packageadmin/PackageAdminImpl.java
Log:
[JBOSGI-267] Allow multiple bundles to change state at once

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/packageadmin/PackageAdminImpl.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/packageadmin/PackageAdminImpl.java	2010-02-24 12:58:50 UTC (rev 101391)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/packageadmin/PackageAdminImpl.java	2010-02-24 13:04:28 UTC (rev 101392)
@@ -320,9 +320,8 @@
       // We can only return true if all bundles are resolvable.
       boolean allResolved = resolvableBundles.containsAll(unresolvedBundles);
 
-      // TODO [JBDEPLOY-226] Allow multiple deployments to change state at once
-      resolveBundles(resolvableBundles);
-
+      // Advance the bundles to stage CLASSLOADER and check at the end
+      advanceBundlesToClassloader(resolvableBundles);
       try
       {
          DeployerClient deployerClient = getBundleManager().getDeployerClient();
@@ -337,7 +336,7 @@
       return allResolved;
    }
 
-   private void resolveBundles(List<OSGiBundleState> resolvableBundles) 
+   private void advanceBundlesToClassloader(List<OSGiBundleState> resolvableBundles) 
    {
       for (OSGiBundleState bundleState: resolvableBundles)
       {
@@ -363,10 +362,6 @@
                String fragUnitName = fragment.getDeploymentUnit().getName();
                deployerClient.change(fragUnitName, DeploymentStages.CLASSLOADER);
             }
-
-            //         bundleState.changeState(Bundle.RESOLVED);
-            //         for (OSGiFragmentState fragment : bundleState.getAttachedFragments())
-            //            fragment.changeState(Bundle.RESOLVED);
          }
          catch (DeploymentException ex)
          {