You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gg...@apache.org on 2018/02/05 13:14:30 UTC

[karaf] branch master updated: [KARAF-5591][KARAF-5593] Do not consider blacklisted features during resolution

This is an automated email from the ASF dual-hosted git repository.

ggrzybek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new c9f1826  [KARAF-5591][KARAF-5593] Do not consider blacklisted features during resolution
c9f1826 is described below

commit c9f1826650f08aa00db66f4827ae312869b6da26
Author: Grzegorz Grzybek <gg...@redhat.com>
AuthorDate: Mon Feb 5 14:14:16 2018 +0100

    [KARAF-5591][KARAF-5593] Do not consider blacklisted features during resolution
---
 .../main/java/org/apache/karaf/features/internal/region/Subsystem.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 897c8f9..26f62cf 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
@@ -382,7 +382,7 @@ public class Subsystem extends ResourceImpl {
                 if (TYPE_FEATURE.equals(type) && allFeatures.containsKey(name)) {
                     for (Feature feature : allFeatures.get(name)) {
                         if (range == null || range.contains(VersionTable.getVersion(feature.getVersion()))) {
-                            if (feature != this.feature) {
+                            if (feature != this.feature && !feature.isBlacklisted()) {
                                 String ssName = this.name + "#" + (feature.hasVersion() ? feature.getName() + "-" + feature.getVersion() : feature.getName());
                                 Subsystem fs = getChild(ssName);
                                 if (fs == null) {

-- 
To stop receiving notification emails like this one, please contact
ggrzybek@apache.org.