[FELIX-2440] Karaf - JDK 1.5 build issue - FeaturesServiceTest failure
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@957319 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java b/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java
index 959cb4c..df9b77c 100644
--- a/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java
+++ b/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java
@@ -376,7 +376,7 @@
cfg.update(props);
}
}
- Set<Long> bundles = new HashSet<Long>();
+ Set<Long> bundles = new TreeSet<Long>();
for (String bundleLocation : feature.getBundles()) {
Bundle b = installBundleIfNeeded(state, bundleLocation);
bundles.add(b.getBundleId());
diff --git a/karaf/features/core/src/test/java/org/apache/felix/karaf/features/FeaturesServiceTest.java b/karaf/features/core/src/test/java/org/apache/felix/karaf/features/FeaturesServiceTest.java
index f7b568e..2cbaa54 100644
--- a/karaf/features/core/src/test/java/org/apache/felix/karaf/features/FeaturesServiceTest.java
+++ b/karaf/features/core/src/test/java/org/apache/felix/karaf/features/FeaturesServiceTest.java
@@ -1052,7 +1052,7 @@
repositoriesNode.put("item.0", uri.toString());
expect(prefs.node("features")).andReturn(featuresNode);
featuresNode.clear();
- featuresNode.put("f1" + FeatureImpl.SPLIT_FOR_NAME_AND_VERSION + FeatureImpl.DEFAULT_VERSION, "54321,12345");
+ featuresNode.put("f1" + FeatureImpl.SPLIT_FOR_NAME_AND_VERSION + FeatureImpl.DEFAULT_VERSION, "12345,54321");
prefs.putBoolean("bootFeaturesInstalled", false);
prefs.flush();