Repository: karaf Updated Branches: refs/heads/master d3036736e -> e067a6699
Revert "[KARAF-1075] Use factoryPid when feature create a factory configuration" This reverts commit 8c90fafb1c4061071b442e3cf2efe3ca858de697. Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e067a669 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e067a669 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e067a669 Branch: refs/heads/master Commit: e067a66997a0bb5e61a32c60453a04798fd28572 Parents: d303673 Author: Guillaume Nodet <[email protected]> Authored: Fri Jul 11 21:18:34 2014 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Fri Jul 11 21:18:34 2014 +0200 ---------------------------------------------------------------------- .../karaf/features/internal/service/FeatureConfigInstaller.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/e067a669/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java index 5201e0c..3a44181 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeatureConfigInstaller.java @@ -80,7 +80,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); }
