Merge

1 files changed, 5 insertions, 3 deletions

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 977946cbf71..86c20bf96af 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
@@ -400,15 +400,17 @@ public class DeployState implements ConfigDefinitionStore {
                     String searchName = builder.importReader(reader, readerName, logger);
                     String sdName = stripSuffix(readerName, ApplicationPackage.SD_NAME_SUFFIX);
                     names.put(searchName, sdName);
-                    if (!sdName.equals(searchName)) {
+                    if ( ! sdName.equals(searchName)) {
                         throw new IllegalArgumentException("Search definition file name ('" + sdName + "') and name of " +
                                                            "search element ('" + searchName +
                                                            "') are not equal for file '" + readerName + "'");
                     }
                 } catch (ParseException e) {
-                    throw new IllegalArgumentException("Could not parse search definition file '" + getSearchDefinitionRelativePath(reader.getName()) + "': " + e.getMessage(), e);
+                    throw new IllegalArgumentException("Could not parse search definition file '" +
+                                                       getSearchDefinitionRelativePath(reader.getName()) + "': " + e.getMessage(), e);
                 } catch (IOException e) {
-                    throw new IllegalArgumentException("Could not read search definition file '" + getSearchDefinitionRelativePath(reader.getName()) + "': " + e.getMessage(), e);
+                    throw new IllegalArgumentException("Could not read search definition file '" +
+                                                       getSearchDefinitionRelativePath(reader.getName()) + "': " + e.getMessage(), e);
                 } finally {
                     closeIgnoreException(reader.getReader());
                 }