summaryrefslogtreecommitdiffstats
path: root/config-application-package
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2022-03-25 10:43:30 +0100
committerJon Marius Venstad <venstad@gmail.com>2022-03-25 10:43:30 +0100
commit41f20e0ffe572f2b42b389e21c5c683a38f319a2 (patch)
treed5e1fa9112e5b842c0128c613c378a943e14cd34 /config-application-package
parent7d8808a32d70cbf17a45059b4541e350307c01dd (diff)
Improve error message
Diffstat (limited to 'config-application-package')
-rw-r--r--config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java5
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;
}