diff options
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; } |