Repository: karaf Updated Branches: refs/heads/karaf-2.x e6d604875 -> 9e9852f0b
[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/9e9852f0 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9e9852f0 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9e9852f0 Branch: refs/heads/karaf-2.x Commit: 9e9852f0bc1cd1e68b9b11ea6ffc930383f48690 Parents: e6d6048 Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon Feb 17 14:58:49 2014 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Feb 17 14:58:49 2014 +0100 ---------------------------------------------------------------------- .../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/9e9852f0/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 7371e8f..eec1ec0 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 @@ -1253,7 +1253,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(pid, null); + return configurationAdmin.createFactoryConfiguration(factoryPid, null); } else { return configurationAdmin.getConfiguration(pid, null); }
