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 2016/11/21 12:34:02 UTC
karaf git commit: [KARAF-4827] Cannot install feature depending on
other 2+ levels of features with prerequisite="true"
Repository: karaf
Updated Branches:
refs/heads/master ea121450e -> 5e3a5523b
[KARAF-4827] Cannot install feature depending on other 2+ levels of features with prerequisite="true"
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5e3a5523
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5e3a5523
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5e3a5523
Branch: refs/heads/master
Commit: 5e3a5523b92f293eb3bdece501a4e3ebac038a96
Parents: ea12145
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Nov 21 13:33:25 2016 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Nov 21 13:33:25 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/karaf/features/internal/region/Subsystem.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/5e3a5523/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java b/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
index 6a518d5..5f4c231 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
@@ -342,7 +342,7 @@ public class Subsystem extends ResourceImpl {
for (Subsystem child : children) {
child.doCollectPrerequisites(prereqs);
}
- if (feature != null) {
+ if (feature != null && !prereqs.contains(feature.getId())) {
for (Dependency dep : feature.getDependencies()) {
if (dep.isPrerequisite()) {
prereqs.add(dep.toString());