Repository: karaf Updated Branches: refs/heads/master 467936840 -> 2688eab14
[KARAF-4830] Keep features order while parsing boot features Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2688eab1 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2688eab1 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2688eab1 Branch: refs/heads/master Commit: 2688eab144f32691aaf7f5daac9bcf8641c3a469 Parents: 4679368 Author: Guillaume Nodet <[email protected]> Authored: Wed Nov 23 10:33:59 2016 +0100 Committer: Guillaume Nodet <[email protected]> Committed: Wed Nov 23 10:33:59 2016 +0100 ---------------------------------------------------------------------- .../features/internal/service/BootFeaturesInstaller.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/2688eab1/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java index e8478f6..47eae9f 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java @@ -20,8 +20,8 @@ import java.io.File; import java.net.URI; import java.util.ArrayList; import java.util.EnumSet; -import java.util.HashSet; import java.util.Hashtable; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.StringTokenizer; @@ -128,14 +128,14 @@ public class BootFeaturesInstaller { List<Set<String>> stages = new ArrayList<>(); StringTokenizer tokenizer = new StringTokenizer(bootFeatures, " \t\r\n,()", true); int paren = 0; - Set<String> stage = new HashSet<>(); + Set<String> stage = new LinkedHashSet<>(); while (tokenizer.hasMoreTokens()) { String token = tokenizer.nextToken(); if (token.equals("(")) { if (paren == 0) { if (!stage.isEmpty()) { stages.add(stage); - stage = new HashSet<>(); + stage = new LinkedHashSet<>(); } paren++; } else { @@ -145,7 +145,7 @@ public class BootFeaturesInstaller { if (paren == 1) { if (!stage.isEmpty()) { stages.add(stage); - stage = new HashSet<>(); + stage = new LinkedHashSet<>(); } paren--; } else {
