svn commit: r945659 - /felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java

[gn...@apache.org]

Author: gnodet
Date: Tue May 18 13:59:30 2010
New Revision: 945659

URL: http://svn.apache.org/viewvc?rev=945659&view=rev
Log:
FELIX-2191: Drop-in deployment of feature descriptor with spring-dm bundles fails

Modified:
    felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.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=945659&r1=945658&r2=945659&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 Tue May 18 13:59:30 2010
@@ -899,9 +899,9 @@ public class FeaturesServiceImpl impleme
         }
     }
 
-    public Set<Feature> getFeaturesContainingBundle (Bundle bundle) {
+    public Set<Feature> getFeaturesContainingBundle (Bundle bundle) throws Exception {
         Set<Feature> features = new HashSet<Feature>();
-        for (Map<String, Feature> featureMap : this.features.values()) {
+        for (Map<String, Feature> featureMap : this.getFeatures().values()) {
             for (Feature f : featureMap.values()) {
                 if (f.getBundles().contains(bundle.getLocation())) {
                     features.add(f);
@@ -911,7 +911,7 @@ public class FeaturesServiceImpl impleme
         return features;
     }
 
-    private String getFeaturesContainingBundleList(Bundle bundle) {
+    private String getFeaturesContainingBundleList(Bundle bundle) throws Exception {
         Set<Feature> features = getFeaturesContainingBundle(bundle);
         StringBuilder buffer = new StringBuilder();
         Iterator<Feature> iter = features.iterator();