Merge pull request #171 from elifarley/revert-169-patch-1

taowen · web-flow · commit c1ef60ac1a76 · 2018-03-06T08:57:29.000+08:00
Revert "Possible fix for #168 - Always create new instance of col"
diff --git a/src/main/java/com/jsoniter/ReflectionCollectionDecoder.java b/src/main/java/com/jsoniter/ReflectionCollectionDecoder.java
@@ -38,7 +38,11 @@ private Object decode_(JsonIterator iter) throws Exception {
         if (iter.readNull()) {
             return null;
         }
-        col = (Collection) this.ctor.newInstance();
+        if (col == null) {
+            col = (Collection) this.ctor.newInstance();
+        } else {
+            col.clear();
+        }
         while (iter.readArray()) {
             col.add(compTypeDecoder.decode(iter));
         }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,11 @@ private Object decode_(JsonIterator iter) throws Exception {`
`38`	`38`	`if (iter.readNull()) {`
`39`	`39`	`return null;`
`40`	`40`	`}`
`41`		`- col = (Collection) this.ctor.newInstance();`
	`41`	`+ if (col == null) {`
	`42`	`+ col = (Collection) this.ctor.newInstance();`
	`43`	`+ } else {`
	`44`	`+ col.clear();`
	`45`	`+ }`
`42`	`46`	`while (iter.readArray()) {`
`43`	`47`	`col.add(compTypeDecoder.decode(iter));`
`44`	`48`	`}`