aboutsummaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2018-01-23 16:06:11 +0100
committerJon Bratseth <bratseth@yahoo-inc.com>2018-01-23 16:06:11 +0100
commitd1b1b6633d258cce0af7a56068713dd86dbe2452 (patch)
treea1d518f09bc066556635577595a60c6ed8f24346 /configserver
parentabc111e455e8533e630b4e3ddaf13e1f8e3c0d65 (diff)
Handle missing files properly
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
index 6643e9b3370..2c46f591037 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
@@ -261,6 +261,8 @@ public class ZKApplicationPackage implements ApplicationPackage {
@Override
public File getFileReference(Path pathRelativeToAppDir) {
String fileName = liveApp.getData(ConfigCurator.USERAPP_ZK_SUBPATH + "/" + pathRelativeToAppDir.getRelative());
+ if (fileName == null)
+ return new File(pathRelativeToAppDir.getRelative()); // File does not exist: Manufacture a non-existing file
return new File(fileName);
}