Support for float to BigDecimal in optBigDecimal

John J. Aylward · John J. Aylward · commit bd4b180f4e6a · 2017-05-17T10:51:06.000-04:00
diff --git a/JSONObject.java b/JSONObject.java
@@ -1020,8 +1020,8 @@ public BigDecimal optBigDecimal(String key, BigDecimal defaultValue) {
         if (val instanceof BigInteger){
             return new BigDecimal((BigInteger) val);
         }
-        if (val instanceof Double){
-            return new BigDecimal(((Double) val).doubleValue());
+        if (val instanceof Double || val instanceof Float){
+            return new BigDecimal(((Number) val).doubleValue());
         }
         if (val instanceof Long || val instanceof Integer
                 || val instanceof Short || val instanceof Byte){

Original file line number	Diff line number	Diff line change
`@@ -1020,8 +1020,8 @@ public BigDecimal optBigDecimal(String key, BigDecimal defaultValue) {`
`1020`	`1020`	`if (val instanceof BigInteger){`
`1021`	`1021`	`return new BigDecimal((BigInteger) val);`
`1022`	`1022`	`}`
`1023`		`- if (val instanceof Double){`
`1024`		`- return new BigDecimal(((Double) val).doubleValue());`
	`1023`	`+ if (val instanceof Double \|\| val instanceof Float){`
	`1024`	`+ return new BigDecimal(((Number) val).doubleValue());`
`1025`	`1025`	`}`
`1026`	`1026`	`if (val instanceof Long \|\| val instanceof Integer`
`1027`	`1027`	`\|\| val instanceof Short \|\| val instanceof Byte){`