only suppress complete fields with empty string

1 files changed, 2 insertions, 7 deletions

diff --git a/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java b/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java
index e486e2647cf..8e934001381 100644
--- a/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java
+++ b/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java
@@ -116,11 +116,10 @@ public class JsonSerializationHelper {
     }
 
     public static void serializeStringField(JsonGenerator generator, FieldBase field, StringFieldValue value) {
-        // Hide empty strings
-        if (value.getString().length() == 0) {
+        // Hide fields which only contains an empty string
+        if (value.getString().length() == 0 && field != null) {
             return;
         }
-
         serializeString(generator, field, value.getString());
     }
 
@@ -237,10 +236,6 @@ public class JsonSerializationHelper {
     }
 
     public static void serializeString(JsonGenerator generator, FieldBase field, String value) {
-        if (value.length() == 0) {
-            return;
-        }
-
         fieldNameIfNotNull(generator, field);
         wrapIOException(() -> generator.writeString(value));
     }