From 5d1805b10e7bd27d322177322c476e4e658a320b Mon Sep 17 00:00:00 2001
From: Redkale <8730487+redkale@users.noreply.github.com>
Date: Sat, 26 Sep 2020 22:03:26 +0800
Subject: [PATCH]

---
 src/org/redkale/convert/ArrayDecoder.java      | 1 +
 src/org/redkale/convert/CollectionDecoder.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/org/redkale/convert/ArrayDecoder.java b/src/org/redkale/convert/ArrayDecoder.java
index e0e0f026f..19ed88547 100644
--- a/src/org/redkale/convert/ArrayDecoder.java
+++ b/src/org/redkale/convert/ArrayDecoder.java
@@ -119,6 +119,7 @@ public class ArrayDecoder<T> implements Decodeable<Reader, T[]> {
     }
 
     protected T readMemberValue(Reader in, DeMember member, Decodeable<Reader, T> decoder, boolean first) {
+        if (in == null) return null;
         return decoder.convertFrom(in);
     }
 
diff --git a/src/org/redkale/convert/CollectionDecoder.java b/src/org/redkale/convert/CollectionDecoder.java
index 0e432a0b6..a67feccdd 100644
--- a/src/org/redkale/convert/CollectionDecoder.java
+++ b/src/org/redkale/convert/CollectionDecoder.java
@@ -129,6 +129,7 @@ public class CollectionDecoder<T> implements Decodeable<Reader, Collection<T>> {
     }
 
     protected T readMemberValue(Reader in, DeMember member, Decodeable<Reader, T> decoder, boolean first) {
+        if (in == null) return null;
         return decoder.convertFrom(in);
     }