Merge pull request #10470 from vespa-engine/bratseth/variants-with-multiple-inheritance

Compile all variants also with multiple inheritance

1 files changed, 4 insertions, 3 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileCompiler.java b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileCompiler.java
index f75d04a1311..826c9949bcf 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileCompiler.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileCompiler.java
@@ -75,10 +75,11 @@ public class QueryProfileCompiler {
             variants.addAll(collectVariantsInThis(path, ((BackedOverridableQueryProfile) profile).getBacking(), currentVariant));
 
         Set<DimensionBindingForPath> parentVariants = new HashSet<>();
-        for (QueryProfile inheritedProfile : profile.inherited())
+        for (QueryProfile inheritedProfile : profile.inherited()) {
             parentVariants = collectVariants(path, inheritedProfile, currentVariant);
-        variants.addAll(parentVariants);
-        variants.addAll(combined(variants, parentVariants)); // parents and children may have different variant dimensions
+            variants.addAll(parentVariants);
+            variants.addAll(combined(variants, parentVariants)); // parents and children may have different variant dimensions
+        }
         return variants;
     }