Simplify

1 files changed, 6 insertions, 9 deletions

diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/DimensionRenamer.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/DimensionRenamer.java
index f4cf1b5fabc..22fabe3ada7 100644
--- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/DimensionRenamer.java
+++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/DimensionRenamer.java
@@ -68,17 +68,14 @@ public class DimensionRenamer {
     }
 
     private Map<String, Integer> solve(int maxIterations) {
-        Map<String, Integer> solution = solveWithOrWithoutSoftConstraints(maxIterations);
         int renamesTried = 0;
-        while (solution == null && renamesTried++ < dimensions.size()) {
-            boolean inserted = insertRenameOperation();
-            if ( ! inserted ) break;
-            solution = solveWithOrWithoutSoftConstraints(maxIterations);
+        while (renamesTried++ <= dimensions.size()) {
+            Map<String, Integer> solution = solveWithOrWithoutSoftConstraints(maxIterations);
+            if (solution != null) return solution;
+            if ( ! insertRenameOperation()) return null;
         }
-        if ( solution == null)
-            throw new IllegalArgumentException("Could not find a dimension naming solution " +
-                                               "given constraints\n" + constraintsToString(constraints));
-        return solution;
+        throw new IllegalArgumentException("Could not find a dimension naming solution " +
+                                           "given constraints\n" + constraintsToString(constraints));
     }
 
     private boolean insertRenameOperation() {