bug fixed for issue alibaba#1296

wenshao · wenshao · commit 10a21cd7db27 · 2017-07-02T20:08:06.000+08:00
diff --git a/src/main/java/com/alibaba/fastjson/JSON.java b/src/main/java/com/alibaba/fastjson/JSON.java
@@ -218,7 +218,11 @@ public static JSONObject parseObject(String text) {
             return (JSONObject) obj;
         }
 
-        return (JSONObject) JSON.toJSON(obj);
+        try {
+            return (JSONObject) JSON.toJSON(obj);
+        } catch (RuntimeException e) {
+            throw new JSONException("can not cast to JSONObject.", e);
+        }
     }
 
     /**
diff --git a/src/test/java/com/alibaba/json/bvt/bug/Issue1296.java b/src/test/java/com/alibaba/json/bvt/bug/Issue1296.java
@@ -0,0 +1,20 @@
+package com.alibaba.json.bvt.bug;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONException;
+import junit.framework.TestCase;
+
+/**
+ * Created by wenshao on 02/07/2017.
+ */
+public class Issue1296 extends TestCase {
+    public void test_for_issue() throws Exception {
+        Exception error = null;
+        try {
+            JSON.parseObject("1");
+        } catch (JSONException e) {
+            error = e;
+        }
+        assertNotNull(error);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,11 @@ public static JSONObject parseObject(String text) {`
`218`	`218`	`return (JSONObject) obj;`
`219`	`219`	`}`
`220`	`220`
`221`		`- return (JSONObject) JSON.toJSON(obj);`
	`221`	`+ try {`
	`222`	`+ return (JSONObject) JSON.toJSON(obj);`
	`223`	`+ } catch (RuntimeException e) {`
	`224`	`+ throw new JSONException("can not cast to JSONObject.", e);`
	`225`	`+ }`
`222`	`226`	`}`
`223`	`227`
`224`	`228`	`/**`