diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2020-03-17 13:13:21 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2020-03-17 13:13:21 +0100 |
commit | d6911174dba552778b5768607e1a071e0c6e02a3 (patch) | |
tree | 969a8aa56613e6370c58415ec858da2e167c96f0 /config-application-package | |
parent | 28cc717d9d3c5d201544115de335242bf22ad4da (diff) |
Correctly read expression files from both schemas/ and searchdefinitions/
Diffstat (limited to 'config-application-package')
-rw-r--r-- | config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java | 6 |
1 files changed, 4 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 5860c365947..e93246f49e7 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 @@ -637,8 +637,10 @@ public class FilesApplicationPackage implements ApplicationPackage { File sdDir = new File(appDir, ApplicationPackage.SCHEMAS_DIR.getRelative()); File expressionFile = new File(sdDir, name); - if ( !expressionFile.exists()) - expressionFile = new File(appDir, ApplicationPackage.SEARCH_DEFINITIONS_DIR.getRelative()); + if ( ! expressionFile.exists()) { + sdDir = new File(appDir, ApplicationPackage.SEARCH_DEFINITIONS_DIR.getRelative()); + expressionFile = new File(sdDir, name); + } return expressionFile; } |