diff options
2 files changed, 6 insertions, 4 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; } diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java index 01809faa2f6..5995a52c433 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java @@ -435,9 +435,9 @@ public class DeployState implements ConfigDefinitionStore { "') are not equal for file '" + readerName + "'"); } } catch (ParseException e) { - throw new IllegalArgumentException("Could not parse sd file '" + reader.getName(), e); + throw new IllegalArgumentException("Could not parse sd file '" + reader.getName() + "'", e); } catch (IOException e) { - throw new IllegalArgumentException("Could not read sd file '" + reader.getName(), e); + throw new IllegalArgumentException("Could not read sd file '" + reader.getName() + "'", e); } finally { closeIgnoreException(reader.getReader()); } |