Merge pull request #21820 from vespa-engine/jonmv/better-error-message

Improve error message

1 files changed, 3 insertions, 2 deletions

diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
index 4cde4e7afaa..36ebb621475 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
@@ -548,11 +548,12 @@ public class FilesApplicationPackage extends AbstractApplicationPackage {
         if (new File(name).isAbsolute())
             throw new IllegalArgumentException("Absolute path to ranking expression file is not allowed: " + name);
 
+        Path path = Path.fromString(name);
         File sdDir = new File(appDir, SCHEMAS_DIR.getRelative());
-        File expressionFile = new File(sdDir, name);
+        File expressionFile = new File(sdDir, path.getRelative());
         if ( ! expressionFile.exists()) {
             sdDir = new File(appDir, SEARCH_DEFINITIONS_DIR.getRelative());
-            expressionFile = new File(sdDir, name);
+            expressionFile = new File(sdDir, path.getRelative());
         }
         return expressionFile;
     }