Repository: karaf Updated Branches: refs/heads/karaf-2.3.x 19442ce1c -> c87dcee64
Revert "[KARAF-1075] Use factoryPid when feature create a factory configuration" This reverts commit b398c7690a09b02ad0f900fa4d6f51308f5970aa. Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c87dcee6 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c87dcee6 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c87dcee6 Branch: refs/heads/karaf-2.3.x Commit: c87dcee64ed42d5a477c63eaaff28e38349a5cde Parents: 19442ce Author: Guillaume Nodet <[email protected]> Authored: Fri Jul 11 21:17:28 2014 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Fri Jul 11 21:17:28 2014 +0200 ---------------------------------------------------------------------- .../org/apache/karaf/features/internal/FeaturesServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/c87dcee6/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java b/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java index 221a5ce..3329a49 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java @@ -1275,7 +1275,7 @@ public class FeaturesServiceImpl implements FeaturesService, FrameworkListener { protected Configuration createConfiguration(ConfigurationAdmin configurationAdmin, String pid, String factoryPid) throws IOException, InvalidSyntaxException { if (factoryPid != null) { - return configurationAdmin.createFactoryConfiguration(factoryPid, null); + return configurationAdmin.createFactoryConfiguration(pid, null); } else { return configurationAdmin.getConfiguration(pid, null); }
