commit 1f85338948ebfb351614aadcdecb39d612519f78
author dgaillard <dgaillard@jahia.com> Tue May 07 12:09:46 2019 +0200
committer tdraier <tdraier@jahia.com> Tue May 07 18:01:26 2019 +0200
tree f91f056d7a52a153d5d1b415550a4ae11df16be2
parent 6b29acc236746960b793a349f71cea25bac4b19c

Fix issue on windows, avoid infinite loop and make sure file are created

config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java

diff --git a/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java b/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java
index 4c16593..ebab0e1 100644
--- a/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java
+++ b/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java
@@ -18,7 +18,6 @@
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
-import shaded.org.apache.commons.io.FileUtils;
 
 import java.io.*;
 import java.net.URI;
@@ -120,7 +119,7 @@
                 String key = (String) sourceKeys.nextElement();
                 if (key.equals(FELIX_FILEINSTALL_FILENAME)) {
                     String value = dictionary.get(key).toString();
-                    value = value.substring(value.lastIndexOf(File.separatorChar) + 1);
+                    value = value.substring(value.lastIndexOf("/") + 1);
                     result.put(KARAF_CELLAR_FILENAME, value);
                     try {
                         result.put(KARAF_CELLAR_CONTENT, readFile(new File(storage, value)));
@@ -269,7 +268,7 @@
                 writeFile(storageFile, content);
             }
         } catch (Exception e) {
-            // nothing to do
+            LOGGER.error("CELLAR CONFIG: Issue when trying to persist configuration file", e);
         }
     }