bug fixed for jsonpath reserve

alibaba · Jun 28, 2019 · c4c39ac · c4c39ac
1 parent c9abb11
commit c4c39ac
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.alibaba</groupId>
 	<artifactId>fastjson</artifactId>
-	<version>1.2.59_preview_06</version>
+	<version>1.2.59_preview_07</version>
 
 	<packaging>jar</packaging>
 	<name>fastjson</name>

diff --git a/src/main/java/com/alibaba/fastjson/JSONPath.java b/src/main/java/com/alibaba/fastjson/JSONPath.java
@@ -3893,8 +3893,10 @@ public static Object reserveToObject(Object object, String... paths) {
             path.init();
             Segment lastSegement = path.segments[path.segments.length - 1];
             if (lastSegement instanceof PropertySegment) {
-                PropertySegment propertySegment = (PropertySegment) lastSegement;
                 Object value = path.eval(object);
+                if (value == null) {
+                    continue;
+                }
                 path.set(reserved, value);
             } else {
                 // skip

diff --git a/src/test/java/com/alibaba/json/bvt/path/JSONPath_reverse_test.java b/src/test/java/com/alibaba/json/bvt/path/JSONPath_reverse_test.java
@@ -27,7 +27,7 @@ public void test_reserve3() throws Exception {
         JSONObject object = JSON.parseObject("{\"player\":{\"id\":1001,\"name\":\"ljw\",\"age\":50}}");
 
         assertEquals("{\"player\":{\"name\":\"ljw\",\"id\":1001}}", JSONPath.reserveToObject(object, "player.id", "player.name").toString());
-        assertEquals("{\"player\":{\"name\":\"ljw\",\"id\":1001}}", JSONPath.reserveToObject(object, "player.name", "player.id").toString());
+        assertEquals("{\"player\":{\"name\":\"ljw\",\"id\":1001}}", JSONPath.reserveToObject(object, "player.name", "player.id", "ab.c").toString());
     }