Repository: karaf Updated Branches: refs/heads/master 65e79730c -> 32ab90d67
[KARAF-3471] Display a warn when etc/config.properties is not write-able and don't block the startup Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/32ab90d6 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/32ab90d6 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/32ab90d6 Branch: refs/heads/master Commit: 32ab90d67738bdb57ae725f99f7712e8d84a35bc Parents: 65e7973 Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Apr 9 11:18:22 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Apr 9 11:18:22 2015 +0200 ---------------------------------------------------------------------- .../java/org/apache/karaf/main/ConfigProperties.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/32ab90d6/main/src/main/java/org/apache/karaf/main/ConfigProperties.java ---------------------------------------------------------------------- diff --git a/main/src/main/java/org/apache/karaf/main/ConfigProperties.java b/main/src/main/java/org/apache/karaf/main/ConfigProperties.java index d2803af..659c764 100644 --- a/main/src/main/java/org/apache/karaf/main/ConfigProperties.java +++ b/main/src/main/java/org/apache/karaf/main/ConfigProperties.java @@ -20,6 +20,7 @@ package org.apache.karaf.main; import java.io.File; import java.io.FileNotFoundException; +import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.util.Arrays; @@ -241,10 +242,14 @@ public class ConfigProperties { System.setProperty(KARAF_DELAY_CONSOLE, new Boolean(this.delayConsoleStart).toString()); if (shutdownCommand == null || shutdownCommand.isEmpty()) { - shutdownCommand = UUID.randomUUID().toString(); - Properties temp = new Properties(file); - temp.put(KARAF_SHUTDOWN_COMMAND, Arrays.asList("", "#", "# Generated command shutdown", "#"), shutdownCommand); - temp.save(); + try { + shutdownCommand = UUID.randomUUID().toString(); + Properties temp = new Properties(file); + temp.put(KARAF_SHUTDOWN_COMMAND, Arrays.asList("", "#", "# Generated command shutdown", "#"), shutdownCommand); + temp.save(); + } catch (IOException ioException) { + System.err.println("WARN: can't update etc/config.properties with the generated command shutdown. We advise to manually add the karaf.shutdown.command property."); + } } }
