Repository: karaf Updated Branches: refs/heads/karaf-3.0.x ee79b9751 -> c31edca04
Revert "[KARAF-1075] Use factoryPid when feature create a factory configuration" This reverts commit d3679eb282e3ab70b3eac3a357aabb026564593a. Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c31edca0 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c31edca0 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c31edca0 Branch: refs/heads/karaf-3.0.x Commit: c31edca04692d8127989acbcdadc8157d1390f2a Parents: ee79b97 Author: Guillaume Nodet <[email protected]> Authored: Fri Jul 11 16:21:56 2014 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Fri Jul 11 21:18:02 2014 +0200 ---------------------------------------------------------------------- .../org/apache/karaf/features/internal/FeatureConfigInstaller.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/c31edca0/features/core/src/main/java/org/apache/karaf/features/internal/FeatureConfigInstaller.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/FeatureConfigInstaller.java b/features/core/src/main/java/org/apache/karaf/features/internal/FeatureConfigInstaller.java index 5946a3a..4f26ba0 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/FeatureConfigInstaller.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/FeatureConfigInstaller.java @@ -59,7 +59,7 @@ public class FeatureConfigInstaller { private 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); }
