Merge pull request #11754 from vespa-engine/mpolden/handle-cluster-without-id

Do not detect ID-less content cluster as combined

1 files changed, 3 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
index f221b1974d7..e72e05a6ebc 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
@@ -289,12 +289,13 @@ public class NodesSpecification {
 
         var content = findParentByTag("content", element);
         if (content.isEmpty()) return false;
-        var clusterId = content.get().getAttribute("id");
+        var contentClusterId = content.get().getAttribute("id");
+        if (contentClusterId.isEmpty()) return false;
         for (var rootChild : XML.getChildren(services.get())) {
             if (!"container".equals(rootChild.getTagName())) continue; // Only container can reference content
             var nodes = XML.getChild(rootChild, "nodes");
             if (nodes == null) continue;
-            if (!clusterId.equals(nodes.getAttribute("of"))) continue;
+            if (!contentClusterId.equals(nodes.getAttribute("of"))) continue;
             return true;
         }
         return false;