You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2015/01/08 08:54:24 UTC
[2/2] karaf git commit: [KARAF-3433]tidy up cherry-pick conflict
[KARAF-3433]tidy up cherry-pick conflict
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/aea27bc7
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/aea27bc7
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/aea27bc7
Branch: refs/heads/karaf-3.0.x
Commit: aea27bc7710f7e172e42323f0c67d68484fd127a
Parents: d68bb49
Author: Freeman Fang <fr...@gmail.com>
Authored: Thu Jan 8 15:53:31 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Thu Jan 8 15:53:31 2015 +0800
----------------------------------------------------------------------
.../org/apache/karaf/features/obr/internal/ObrResolver.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/aea27bc7/features/obr/src/main/java/org/apache/karaf/features/obr/internal/ObrResolver.java
----------------------------------------------------------------------
diff --git a/features/obr/src/main/java/org/apache/karaf/features/obr/internal/ObrResolver.java b/features/obr/src/main/java/org/apache/karaf/features/obr/internal/ObrResolver.java
index 1473290..775d7a2 100644
--- a/features/obr/src/main/java/org/apache/karaf/features/obr/internal/ObrResolver.java
+++ b/features/obr/src/main/java/org/apache/karaf/features/obr/internal/ObrResolver.java
@@ -33,6 +33,7 @@ import org.apache.felix.bundlerepository.RepositoryAdmin;
import org.apache.felix.bundlerepository.Requirement;
import org.apache.felix.bundlerepository.Resource;
import org.apache.karaf.features.BundleInfo;
+import org.apache.karaf.features.Dependency;
import org.apache.karaf.features.Feature;
import org.apache.karaf.features.FeaturesService;
import org.apache.karaf.features.Resolver;
@@ -179,9 +180,9 @@ public class ObrResolver implements Resolver {
public List<BundleInfo> getAllBundles(Feature feature) throws Exception {
List<BundleInfo> bundles = new ArrayList<BundleInfo>();
bundles.addAll(feature.getBundles());
- for (Feature dependency : feature.getDependencies()) {
- dependency = getFeaturesService().getFeature(dependency.getName(), dependency.getVersion());
- bundles.addAll(getAllBundles(dependency));
+ for (Dependency dependency : feature.getDependencies()) {
+ Feature dependencyfeature = getFeaturesService().getFeature(dependency.getName(), dependency.getVersion());
+ bundles.addAll(getAllBundles(dependencyfeature));
}
return bundles;