From: NathanSweet <nathan.sweet@gmail.com>
Date: Sat, 12 Jan 2013 01:10:23 +0000 (+0100)
Subject: Json, fixed creating Arrays.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7d659995983227d7d71f8897e0268531f48d87ab;p=mikumikustudio%2Flibgdx-mikumikustudio.git

Json, fixed creating Arrays.
---

diff --git a/gdx/src/com/badlogic/gdx/utils/Json.java b/gdx/src/com/badlogic/gdx/utils/Json.java
index 7124c2282..da4b9bfb3 100644
--- a/gdx/src/com/badlogic/gdx/utils/Json.java
+++ b/gdx/src/com/badlogic/gdx/utils/Json.java
@@ -825,14 +825,14 @@ public class Json {
 		if (jsonData instanceof Array) {
 			Array array = (Array)jsonData;
 			if (type == null || Array.class.isAssignableFrom(type)) {
-				Array newArray = (Array)newInstance(type);
+				Array newArray = type == null ? new Array() : (Array)newInstance(type);
 				newArray.ensureCapacity(array.size);
 				for (int i = 0, n = array.size; i < n; i++)
 					newArray.add(readValue(elementType, null, array.get(i)));
 				return (T)newArray;
 			}
 			if (ArrayList.class.isAssignableFrom(type)) {
-				ArrayList newArray = (ArrayList)newInstance(type);
+				ArrayList newArray = type == null ? new ArrayList() : (ArrayList)newInstance(type);
 				newArray.ensureCapacity(array.size);
 				for (int i = 0, n = array.size; i < n; i++)
 					newArray.add(readValue(elementType, null, array.get(i)));