You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2015/02/19 15:23:01 UTC

karaf git commit: [KARAF-3529] Fix a problem where fragments may not be wired correctly

Repository: karaf
Updated Branches:
  refs/heads/master 95fd0809a -> ffe1dddc1


[KARAF-3529] Fix a problem where fragments may not be wired correctly

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ffe1dddc
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ffe1dddc
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ffe1dddc

Branch: refs/heads/master
Commit: ffe1dddc1d5c629e1a0fa67297a8599a1ed84c56
Parents: 95fd080
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Feb 19 15:22:53 2015 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Feb 19 15:22:53 2015 +0100

----------------------------------------------------------------------
 .../features/internal/service/FeaturesServiceImpl.java      | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/ffe1dddc/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
index 42776a1..2573296 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
@@ -1214,15 +1214,8 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall
         };
         ServiceRegistration<ResolverHookFactory> registration = systemBundleContext.registerService(ResolverHookFactory.class, factory, null);
         try {
-            // Given we already have computed the wiring,
-            // there's no need to resolve the bundles all at the same time.
-            // It's much more efficient to resolve them by small chunks.
-            // We could be even smarter and order the bundles according to the
-            // order given by RequirementSort to minimize the size of needed chunks.
             FrameworkWiring frameworkWiring = systemBundleContext.getBundle().adapt(FrameworkWiring.class);
-            for (Bundle bundle : bundles) {
-                frameworkWiring.resolveBundles(Collections.singleton(bundle));
-            }
+            frameworkWiring.resolveBundles(bundles);
         } finally {
             registration.unregister();
         }