JSON reader fix for String reader

hansonr · hansonr · commit 014119c01063 · 2019-02-04T11:20:30.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/json/JSON.java b/sources/net.sf.j2s.java.core/src/swingjs/json/JSON.java
@@ -103,7 +103,10 @@ public static Object parse(String json) {
 	}
 
 	public static Object parse(Reader br) {
-		return ((JSONReader) br).data;
+		if (br instanceof JSONReader)
+			return ((JSONReader) br).data;
+		InputStream is = /** @j2sNative br.$in || */null;
+		return parse(is);
 	}
 
 	/**
@@ -164,11 +167,14 @@ public static class JSONReader extends BufferedReader {
 		Object data;
 
 		public JSONReader(InputStream in) {
-			super((Reader) (Object) in);
+			super((Reader) (Object) "");
 			// could be buffered
 			data = toObject(/** @j2sNative $in._ajaxData || $in.$in && $in.$in._ajaxData || */
 					null);
-
+			if (data == null) {
+				String json = (/** @j2sNative $in.str || $in.$in && $in.$in.str || */null);
+				data = toObject(JSUtil.parseJSONRaw(json));
+			}
 		}
 
 		public JSONReader(Reader in) {
