Repository: karaf Updated Branches: refs/heads/master e99358404 -> f27254f3f
Revert "[KARAF-1075] Use factoryPid when feature create a factory configuration" Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f27254f3 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f27254f3 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f27254f3 Branch: refs/heads/master Commit: f27254f3ff53da9bffa0d2b1e647ee6c69d5f2c1 Parents: e993584 Author: Jean-Baptiste Onofré <[email protected]> Authored: Wed Oct 8 07:44:29 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed Oct 8 07:44:29 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/f27254f3/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 9d7f38a..aa5c21e 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 @@ -67,7 +67,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); }
