Add fixes to Blackbird, even if we cannot quite reproduce the failure.

cowtowncoder · cowtowncoder · commit 385ce16f315b · 2023-01-16T20:40:33.000-08:00
diff --git a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/ser/ObjectPropertyWriter.java b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/ser/ObjectPropertyWriter.java
@@ -57,12 +57,14 @@ public final void serializeAsField(Object bean, JsonGenerator gen, SerializerPro
         }
         // Null (etc) handling; copied from super-class impl
         if (value == null) {
+            // 20-Jun-2022, tatu: Defer checking of null, see [databind#3481]
+            if ((_suppressableValue != null)
+                    && prov.includeFilterSuppressNulls(_suppressableValue)) {
+                return;
+            }
             if (_nullSerializer != null) {
                 gen.writeFieldName(_fastName);
                 _nullSerializer.serialize(null, gen, prov);
-            } else if (!_suppressNulls) {
-                gen.writeFieldName(_fastName);
-                prov.defaultSerializeNull(gen);
             }
             return;
         }
diff --git a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/ser/StringPropertyWriter.java b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/ser/StringPropertyWriter.java
@@ -57,12 +57,14 @@ public final void serializeAsField(Object bean, JsonGenerator gen, SerializerPro
         }
         // Null (etc) handling; copied from super-class impl
         if (value == null) {
+            // 20-Jun-2022, tatu: Defer checking of null, see [databind#3481]
+            if ((_suppressableValue != null)
+                    && prov.includeFilterSuppressNulls(_suppressableValue)) {
+                return;
+            }
             if (_nullSerializer != null) {
                 gen.writeFieldName(_fastName);
                 _nullSerializer.serialize(null, gen, prov);
-            } else if (!_suppressNulls) {
-                gen.writeFieldName(_fastName);
-                prov.defaultSerializeNull(gen);
             }
             return;
         }

Original file line number	Diff line number	Diff line change
`@@ -57,12 +57,14 @@ public final void serializeAsField(Object bean, JsonGenerator gen, SerializerPro`
`57`	`57`	`}`
`58`	`58`	`// Null (etc) handling; copied from super-class impl`
`59`	`59`	`if (value == null) {`
	`60`	`+ // 20-Jun-2022, tatu: Defer checking of null, see [databind#3481]`
	`61`	`+ if ((_suppressableValue != null)`
	`62`	`+ && prov.includeFilterSuppressNulls(_suppressableValue)) {`
	`63`	`+ return;`
	`64`	`+ }`
`60`	`65`	`if (_nullSerializer != null) {`
`61`	`66`	`gen.writeFieldName(_fastName);`
`62`	`67`	`_nullSerializer.serialize(null, gen, prov);`
`63`		`- } else if (!_suppressNulls) {`
`64`		`- gen.writeFieldName(_fastName);`
`65`		`- prov.defaultSerializeNull(gen);`
`66`	`68`	`}`
`67`	`69`	`return;`
`68`	`70`	`}`