Repository: karaf Updated Branches: refs/heads/master ecc855c6a -> 7f9ef85bd
[KARAF-4271][KARAF-4272] Load dependent feature repositories with circular refs protection Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/7f9ef85b Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/7f9ef85b Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/7f9ef85b Branch: refs/heads/master Commit: 7f9ef85bd9067e95e593a4b552d80505daadd740 Parents: 40c9f59 Author: Grzegorz Grzybek <[email protected]> Authored: Mon Oct 24 13:48:01 2016 +0200 Committer: Grzegorz Grzybek <[email protected]> Committed: Mon Oct 31 08:44:39 2016 +0100 ---------------------------------------------------------------------- .../karaf/features/internal/service/FeaturesServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/7f9ef85b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java index 18b97d8..090112f 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java @@ -691,7 +691,9 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall synchronized (lock) { repositoryCache.put(uri, repo); } - for (URI u : repo.getRepositories()) { + } + for (URI u : repo.getRepositories()) { + if (!toLoad.contains(u.toString())) { toLoad.add(u.toString()); } }
