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 2019/03/08 05:11:08 UTC
[karaf] branch master updated: [KARAF-6160] Avoid NPE when
configCfgStore=false in etc/org.apache.karaf.features.cfg
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new e192fff [KARAF-6160] Avoid NPE when configCfgStore=false in etc/org.apache.karaf.features.cfg
new db71f9a [KARAF-6160] This closes #774
e192fff is described below
commit e192fffc3f8a0ae894e78cd37b0a1387075756e5
Author: Xilai Dai <xl...@talend.com>
AuthorDate: Thu Mar 7 11:09:53 2019 +0800
[KARAF-6160] Avoid NPE when configCfgStore=false in etc/org.apache.karaf.features.cfg
---
.../apache/karaf/features/internal/service/FeatureConfigInstaller.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 7f16171..66ec66d 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
@@ -112,7 +112,7 @@ public class FeatureConfigInstaller {
if (cfg == null) {
File cfgFile = null;
- if (storage != null && configCfgStore) {
+ if (storage != null) {
cfgFile = new File(storage, cid.fullPid + ".cfg");
}
if (!cfgFile.exists()) {