Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 170A9200D21 for ; Mon, 16 Oct 2017 13:06:18 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 15A171609EF; Mon, 16 Oct 2017 11:06:18 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5B4E21609EC for ; Mon, 16 Oct 2017 13:06:17 +0200 (CEST) Received: (qmail 61205 invoked by uid 500); 16 Oct 2017 11:06:16 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 61196 invoked by uid 99); 16 Oct 2017 11:06:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Oct 2017 11:06:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 640BADFAE3; Mon, 16 Oct 2017 11:06:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gnodet@apache.org To: commits@karaf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: karaf git commit: [KARAF-5371] Make sure the region hooks are invoked first by the framework Date: Mon, 16 Oct 2017 11:06:16 +0000 (UTC) archived-at: Mon, 16 Oct 2017 11:06:18 -0000 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 Authored: Wed Oct 11 16:11:33 2017 +0200 Committer: Guillaume Nodet 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 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);