From c65275db5de9c001fe23a10b8d8c1539ef9a3506 Mon Sep 17 00:00:00 2001
From: wangbin <wangbin@taover.com>
Date: Mon, 2 Mar 2020 21:06:19 +0800
Subject: [PATCH] 1.fix a bug when json has null

---
 build.gradle                                | 2 +-
 src/main/java/com/taover/util/UtilJSON.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index d298d91..99a2cbb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,7 +59,7 @@ uploadArchives {
                 authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD)
             }
             pom.project {
-                version '1.1.40'
+                version '1.1.41'
                 artifactId ARTIFACT_Id
                 groupId GROUP_ID
                 packaging TYPE
diff --git a/src/main/java/com/taover/util/UtilJSON.java b/src/main/java/com/taover/util/UtilJSON.java
index f8018e0..c7504e5 100644
--- a/src/main/java/com/taover/util/UtilJSON.java
+++ b/src/main/java/com/taover/util/UtilJSON.java
@@ -49,7 +49,7 @@ public class UtilJSON {
 		}
 		for(int i=0; i<dataArr.size(); ++i){
 			JSONObject dataItem = dataArr.optJSONObject(i);
-			if(dataItem.isNullObject()){
+			if(isJsonNull(dataItem)){
 				dataArr.remove(i);
 				continue;
 			}
@@ -87,7 +87,7 @@ public class UtilJSON {
 		}
 		for(int i=0; i<dataArr.size(); ++i){
 			JSONObject dataItem = dataArr.optJSONObject(i);
-			if(dataItem.isNullObject()){
+			if(isJsonNull(dataItem)){
 				dataArr.set(i, target);
 				continue;
 			}
--
libgit2 0.21.2