Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller

1 files changed, 4 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/processing/ValidateFieldTypes.java b/config-model/src/main/java/com/yahoo/schema/processing/ValidateFieldTypes.java
index 2327cf4d9c9..662f3fc970b 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/ValidateFieldTypes.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/ValidateFieldTypes.java
@@ -1,4 +1,4 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.schema.processing;
 
 import com.yahoo.config.application.api.DeployLogger;
@@ -49,7 +49,9 @@ public class ValidateFieldTypes extends Processor {
     final protected void verifySummaryFields(String searchName, Map<String, DataType> seenFields) {
         for (DocumentSummary summary : schema.getSummaries().values()) {
             for (SummaryField field : summary.getSummaryFields().values()) {
-                checkFieldType(searchName, "summary field", field.getName(), field.getDataType(), seenFields);
+                if (!field.hasUnresolvedType()) {
+                    checkFieldType(searchName, "summary field", field.getName(), field.getDataType(), seenFields);
+                }
             }
         }
     }