Repository: karaf Updated Branches: refs/heads/karaf-2.x 7df5d081c -> f210c80f6
Revert "[KARAF-1075] Use factoryPid when feature create a factory configuration" This reverts commit 9e9852f0bc1cd1e68b9b11ea6ffc930383f48690. Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f210c80f Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f210c80f Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f210c80f Branch: refs/heads/karaf-2.x Commit: f210c80f6369b2a5aaf9e0c699280be5bc2247bd Parents: 7df5d08 Author: Guillaume Nodet <[email protected]> Authored: Fri Jul 11 21:17:50 2014 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Fri Jul 11 21:20:51 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/f210c80f/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 f90a985..7b1cf98 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 @@ -1286,7 +1286,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); }
