karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [karaf] branch karaf-4.2.x updated: [KARAF-6160] Avoid NPE when configCfgStore=false in etc/org.apache.karaf.features.cfg
Date Fri, 08 Mar 2019 05:11:41 GMT
This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
     new a73d31f  [KARAF-6160] Avoid NPE when configCfgStore=false in etc/org.apache.karaf.features.cfg
a73d31f is described below

commit a73d31fe1311fc8e649b2569602f167c7bd5a894
Author: Xilai Dai <xldai@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()) {


Mime
View raw message