Merge branch 'big-numbers' of https://github.com/douglascrockford/JSON-Java into local-big-numbers

stleary · stleary · commit 474f285cc83a · 2015-07-03T22:05:05.000-05:00
diff --git a/JSONObject.java b/JSONObject.java
@@ -1633,7 +1633,8 @@ public static Object wrap(Object object) {
                     || object instanceof Short || object instanceof Integer
                     || object instanceof Long || object instanceof Boolean
                     || object instanceof Float || object instanceof Double
-                    || object instanceof String) {
+                    || object instanceof String || object instanceof BigInteger
+                    || object instanceof BigDecimal) {
                 return object;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -1633,7 +1633,8 @@ public static Object wrap(Object object) {`
`1633`	`1633`	`\|\| object instanceof Short \|\| object instanceof Integer`
`1634`	`1634`	`\|\| object instanceof Long \|\| object instanceof Boolean`
`1635`	`1635`	`\|\| object instanceof Float \|\| object instanceof Double`
`1636`		`- \|\| object instanceof String) {`
	`1636`	`+ \|\| object instanceof String \|\| object instanceof BigInteger`
	`1637`	`+ \|\| object instanceof BigDecimal) {`
`1637`	`1638`	`return object;`
`1638`	`1639`	`}`
`1639`	`1640`