fix null value field read error on non-default-constructor, for issue a…

…libaba#2233
rowstop · Feb 4, 2024 · 1dd43ce · 1dd43ce
1 parent 0bf5235
commit 1dd43ce
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderNoneDefaultConstructor.java b/core/src/main/java/com/alibaba/fastjson2/reader/ObjectReaderNoneDefaultConstructor.java
@@ -279,7 +279,9 @@ public T readObject(JSONReader jsonReader, Type fieldType, Object fieldName, lon
                 }
                 continue;
             }
-
+            if (jsonReader.nextIfNull()) {
+                continue;
+            }
             FieldReader fieldReader = getFieldReader(hashCode);
             FieldReader paramReader = paramFieldReaderMap.get(hashCode);
             if (paramReader != null

diff --git a/core/src/test/java/com/alibaba/fastjson2/issues_2200/Issue2233.java b/core/src/test/java/com/alibaba/fastjson2/issues_2200/Issue2233.java
@@ -30,6 +30,33 @@ void test() throws JSONException {
         JSONAssert.assertEquals(json, JSON.toJSONString(obj, JSONWriter.Feature.WriteNulls), true);
     }
 
+    @Test
+    void test2() throws JSONException {
+        String json = "{\"log_entries\": null,\"test\":[]}";
+        Obj2 obj = assertDoesNotThrow(
+                () -> JSON.parseObject(json, Obj2.class)
+        );
+        JSONAssert.assertEquals(json, JSON.toJSONString(obj, JSONWriter.Feature.WriteNulls), true);
+    }
+
+    @Getter
+    @Setter
+    static class Obj2{
+        @JsonProperty("log_entries")
+        private List<LogEntry> logEntries;
+        private List test;
+
+        public Obj2(List<LogEntry> logEntries) {
+            this.logEntries = logEntries;
+        }
+    }
+
+    @Getter
+    @Setter
+    static class LogEntry{
+        private String name;
+    }
+
     @Getter
     @Setter
     static class Obj{