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 B1642200CEC for ; Mon, 21 Aug 2017 10:25:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AFF8C164497; Mon, 21 Aug 2017 08:25:06 +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 153E016449D for ; Mon, 21 Aug 2017 10:25:05 +0200 (CEST) Received: (qmail 7399 invoked by uid 500); 21 Aug 2017 08:25:05 -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 7248 invoked by uid 99); 21 Aug 2017 08:25:05 -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, 21 Aug 2017 08:25:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A314FF3316; Mon, 21 Aug 2017 08:25:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cschneider@apache.org To: commits@karaf.apache.org Date: Mon, 21 Aug 2017 08:25:05 -0000 Message-Id: <0b8359b9e0a24aa0a8463a950b6d890a@git.apache.org> In-Reply-To: <8cfef609a62a4d6fbf64af7a5a749b49@git.apache.org> References: <8cfef609a62a4d6fbf64af7a5a749b49@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] karaf git commit: [KARAF-5314] Only recurse into dependencies once per feature archived-at: Mon, 21 Aug 2017 08:25:06 -0000 [KARAF-5314] Only recurse into dependencies once per feature Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5a8133db Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5a8133db Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5a8133db Branch: refs/heads/master Commit: 5a8133dbbfe7ede7366bcb943e2bd04937d8eff5 Parents: 0ed141d Author: Christian Schneider Authored: Sun Aug 20 16:20:09 2017 +0200 Committer: Christian Schneider Committed: Sun Aug 20 16:20:09 2017 +0200 ---------------------------------------------------------------------- .../org/apache/karaf/profile/assembly/FeatureSelector.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/5a8133db/profile/src/main/java/org/apache/karaf/profile/assembly/FeatureSelector.java ---------------------------------------------------------------------- diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/FeatureSelector.java b/profile/src/main/java/org/apache/karaf/profile/assembly/FeatureSelector.java index 1e453d6..156cb46 100644 --- a/profile/src/main/java/org/apache/karaf/profile/assembly/FeatureSelector.java +++ b/profile/src/main/java/org/apache/karaf/profile/assembly/FeatureSelector.java @@ -55,9 +55,10 @@ public class FeatureSelector { throw new IllegalStateException("Could not find matching feature for " + feature); } for (Feature f : set) { - features.add(f); - for (Dependency dep : f.getFeature()) { - addFeatures(dep.toString(), features, isMandatory(dep)); + if (features.add(f)) { + for (Dependency dep : f.getFeature()) { + addFeatures(dep.toString(), features, isMandatory(dep)); + } } } }