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 2019/10/21 14:39:10 UTC

[karaf] branch karaf-4.2.x updated: [KARAF-6472] Properly handle choice of non-blacklisted features where there are many of them

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

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


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
     new 88d3f64  [KARAF-6472] Properly handle choice of non-blacklisted features where there are many of them
88d3f64 is described below

commit 88d3f6488112119b5d0482a1e83f9709d8f7255b
Author: Grzegorz Grzybek <gr...@gmail.com>
AuthorDate: Mon Oct 21 16:38:37 2019 +0200

    [KARAF-6472] Properly handle choice of non-blacklisted features where there are many of them
    
    (cherry picked from commit 910d6849624f4e22ee9dbeebfedb1c6eb60a9472)
---
 .../java/org/apache/karaf/features/internal/service/FeatureReq.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureReq.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureReq.java
index 696d2b7..d28bdce 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureReq.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureReq.java
@@ -126,7 +126,9 @@ public class FeatureReq {
                     if (feature == null || !possiblyBlacklisted.isBlacklisted()) {
                         feature = possiblyBlacklisted;
                     }
-                    latest = availableVersion;
+                    if (!possiblyBlacklisted.isBlacklisted()) {
+                        latest = availableVersion;
+                    }
                 }
             }
         }