diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-08-06 12:43:20 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-08-06 12:43:20 +0200 |
commit | f50b3685adfbe94e4c672bcef2f086a99dc8e16e (patch) | |
tree | e08cb4d64bf50d41542b59b6b07f7b7568a5f697 /node-admin/src/main | |
parent | 4882c6c886c7d6a78e6d3a381619de82e5d32e33 (diff) |
Handle non-existing default-env.txt file
Diffstat (limited to 'node-admin/src/main')
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/DefaultEnvRewriter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/DefaultEnvRewriter.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/DefaultEnvRewriter.java index 8bfaec3abf3..f8412d07c23 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/DefaultEnvRewriter.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/DefaultEnvRewriter.java @@ -11,6 +11,7 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; +import static com.yahoo.vespa.hosted.node.admin.task.util.file.IOExceptionUtil.ifExists; import static com.yahoo.yolean.Exceptions.uncheck; import static java.nio.file.StandardCopyOption.ATOMIC_MOVE; @@ -49,7 +50,7 @@ public class DefaultEnvRewriter { } public boolean converge() { - List<String> defaultEnvLines = uncheck(() -> Files.readAllLines(defaultEnvFile)); + List<String> defaultEnvLines = ifExists(() -> Files.readAllLines(defaultEnvFile)).orElse(List.of()); List<String> newDefaultEnvLines = new ArrayList<>(); Set<String> seenNames = new TreeSet<>(); for (String line : defaultEnvLines) { |