You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2017/08/03 14:35:17 UTC
[05/15] karaf git commit: Fix problem between features config
installer and file install when using factory pids
Fix problem between features config installer and file install when using factory pids
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b2d37089
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b2d37089
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b2d37089
Branch: refs/heads/OPENSSH
Commit: b2d37089277de1019916a77738817a22d7469009
Parents: f7ea3e0
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed Jul 26 10:54:01 2017 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed Aug 2 14:10:48 2017 +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/b2d37089/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 5474806..e1f0ca8 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
@@ -255,7 +255,7 @@ public class FeatureConfigInstaller {
} else {
cfgFile = new File(storage, pid + ".cfg");
}
- Configuration cfg = findExistingConfiguration(configAdmin, factoryPid, pid);
+ Configuration cfg = findExistingConfiguration(configAdmin, pid, factoryPid);
// update the cfg file depending of the configuration
if (cfg != null && cfg.getProperties() != null) {
Object val = cfg.getProperties().get(FILEINSTALL_FILE_NAME);