You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/02/17 14:29:06 UTC
git commit: [KARAF-1075] Use factoryPid when feature create a factory
configuration
Repository: karaf
Updated Branches:
refs/heads/master 8a4c9124a -> 8c90fafb1
[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/8c90fafb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8c90fafb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8c90fafb
Branch: refs/heads/master
Commit: 8c90fafb1c4061071b442e3cf2efe3ca858de697
Parents: 8a4c912
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Feb 17 14:27:02 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Feb 17 14:27:02 2014 +0100
----------------------------------------------------------------------
.../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/8c90fafb/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 4f26ba0..5946a3a 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(pid, null);
+ return configurationAdmin.createFactoryConfiguration(factoryPid, null);
} else {
return configurationAdmin.getConfiguration(pid, null);
}