Merge pull request #4757 from vespa-engine/bratseth/handle-no-file

Handle missing files properly

2 files changed, 3 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java
index c16d12f76d1..c95601f6bbf 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java
@@ -187,7 +187,7 @@ public class TensorFlowFeatureConverter extends ExpressionTransformer<RankProfil
 
         public boolean hasTensorFlowModels() {
             try {
-                return application.getFileReference(ApplicationPackage.MODELS_DIR).exists();
+                return application.getFile(ApplicationPackage.MODELS_DIR).exists();
             }
             catch (UnsupportedOperationException e) {
                 return false; // No files -> no TensorFlow models
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);
     }