svn commit: r957319 - in /felix/trunk/karaf/features/core/src: main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java test/java/org/apache/felix/karaf/features/FeaturesServiceTest.java

[jgoodyear]

Author: jgoodyear
Date: Wed Jun 23 19:38:46 2010
New Revision: 957319

URL: http://svn.apache.org/viewvc?rev=957319&view=rev
Log:
[FELIX-2440] Karaf - JDK 1.5 build issue - FeaturesServiceTest failure

Modified:
    
felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java
    
felix/trunk/karaf/features/core/src/test/java/org/apache/felix/karaf/features/FeaturesServiceTest.java

Modified: 
felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java?rev=957319&r1=957318&r2=957319&view=diff
==============================================================================
--- 
felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java
 (original)
+++ 
felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java
 Wed Jun 23 19:38:46 2010
@@ -376,7 +376,7 @@ public class FeaturesServiceImpl impleme
                 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());

Modified: 
felix/trunk/karaf/features/core/src/test/java/org/apache/felix/karaf/features/FeaturesServiceTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/karaf/features/core/src/test/java/org/apache/felix/karaf/features/FeaturesServiceTest.java?rev=957319&r1=957318&r2=957319&view=diff
==============================================================================
--- 
felix/trunk/karaf/features/core/src/test/java/org/apache/felix/karaf/features/FeaturesServiceTest.java
 (original)
+++ 
felix/trunk/karaf/features/core/src/test/java/org/apache/felix/karaf/features/FeaturesServiceTest.java
 Wed Jun 23 19:38:46 2010
@@ -1052,7 +1052,7 @@ public class FeaturesServiceTest extends
         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();