OSDN Git Service

Json, fixed creating Arrays.
authorNathanSweet <nathan.sweet@gmail.com>
Sat, 12 Jan 2013 01:10:23 +0000 (02:10 +0100)
committerNathanSweet <nathan.sweet@gmail.com>
Sat, 12 Jan 2013 01:10:23 +0000 (02:10 +0100)
gdx/src/com/badlogic/gdx/utils/Json.java

index 7124c22..da4b9bf 100644 (file)
@@ -825,14 +825,14 @@ public class Json {
                if (jsonData instanceof Array) {\r
                        Array array = (Array)jsonData;\r
                        if (type == null || Array.class.isAssignableFrom(type)) {\r
-                               Array newArray = (Array)newInstance(type);\r
+                               Array newArray = type == null ? new Array() : (Array)newInstance(type);\r
                                newArray.ensureCapacity(array.size);\r
                                for (int i = 0, n = array.size; i < n; i++)\r
                                        newArray.add(readValue(elementType, null, array.get(i)));\r
                                return (T)newArray;\r
                        }\r
                        if (ArrayList.class.isAssignableFrom(type)) {\r
-                               ArrayList newArray = (ArrayList)newInstance(type);\r
+                               ArrayList newArray = type == null ? new ArrayList() : (ArrayList)newInstance(type);\r
                                newArray.ensureCapacity(array.size);\r
                                for (int i = 0, n = array.size; i < n; i++)\r
                                        newArray.add(readValue(elementType, null, array.get(i)));\r