diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-03-25 14:26:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-25 14:26:16 +0100 |
commit | b1690f2ee531fc1ebd982b80216f523970833d76 (patch) | |
tree | d5a6bf1a5caae13aab4cbbe9282d7f233d8304bc /config-application-package | |
parent | 11f510e66e439d008ecab87deecaeb63b70d5cab (diff) | |
parent | 41f20e0ffe572f2b42b389e21c5c683a38f319a2 (diff) |
Merge pull request #21820 from vespa-engine/jonmv/better-error-message
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.java | 5 |
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; } |