avoid setDataType when possible

1 files changed, 7 insertions, 3 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
index a29d66dc8f2..88a98b94ddc 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
@@ -252,9 +252,13 @@ public class DocumentModelBuilder {
         } else if (type instanceof StructDataType) {
             StructDataType dt = (StructDataType) type;
             for (com.yahoo.document.Field field : dt.getFields()) {
-                if (field.getDataType() != type) {
-                    // XXX deprecated:
-                    field.setDataType(resolveTemporariesRecurse(field.getDataType(), repo, docs, replacements));
+                var ft = field.getDataType();
+                if (ft != type) {
+                    var newft = resolveTemporariesRecurse(ft, repo, docs, replacements);
+                    if (ft != newft) {
+                        // XXX deprecated:
+                        field.setDataType(newft);
+                    }
                 }
             }
         }