Repository: karaf Updated Branches: refs/heads/karaf-4.1.x 04dfa30af -> 8dbd217b0
[KARAF-5371] Make sure the region hooks are invoked first by the framework # Conflicts: # features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8dbd217b Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8dbd217b Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8dbd217b Branch: refs/heads/karaf-4.1.x Commit: 8dbd217b0f0a843ca114eb9f1a43ed53734f601c Parents: 04dfa30 Author: Guillaume Nodet <[email protected]> Authored: Wed Oct 11 16:11:33 2017 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Mon Oct 16 13:05:35 2017 +0200 ---------------------------------------------------------------------- .../apache/karaf/features/internal/osgi/Activator.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/8dbd217b/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java b/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java index e591c12..3f306fa 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java @@ -126,13 +126,15 @@ public class Activator extends BaseActivator { } // RegionDigraph + Dictionary<String, Object> ranking = new Hashtable<>(); + ranking.put(Constants.SERVICE_RANKING, 1000); StandardRegionDigraph dg = digraph = DigraphHelper.loadDigraph(bundleContext); register(ResolverHookFactory.class, dg.getResolverHookFactory()); register(CollisionHook.class, CollisionHookHelper.getCollisionHook(dg)); - register(org.osgi.framework.hooks.bundle.FindHook.class, dg.getBundleFindHook()); - register(org.osgi.framework.hooks.bundle.EventHook.class, dg.getBundleEventHook()); - register(org.osgi.framework.hooks.service.FindHook.class, dg.getServiceFindHook()); - register(org.osgi.framework.hooks.service.EventHook.class, dg.getServiceEventHook()); + register(org.osgi.framework.hooks.bundle.FindHook.class, dg.getBundleFindHook(), ranking); + register(org.osgi.framework.hooks.bundle.EventHook.class, dg.getBundleEventHook(), ranking); + register(org.osgi.framework.hooks.service.FindHook.class, dg.getServiceFindHook(), ranking); + register(org.osgi.framework.hooks.service.EventHook.class, dg.getServiceEventHook(), ranking); register(RegionDigraph.class, dg); register(RegionDigraphPersistence.class, this::doPersistRegionDigraph); DigraphHelper.verifyUnmanagedBundles(bundleContext, dg);
