correct string check for JSONObject optBigDecimal and optBigInteger

John J. Aylward · John J. Aylward · commit a7f8ff24df65 · 2017-05-18T14:41:42.000-04:00
diff --git a/JSONObject.java b/JSONObject.java
@@ -1024,14 +1024,12 @@ public BigDecimal optBigDecimal(String key, BigDecimal defaultValue) {
                 || val instanceof Short || val instanceof Byte){
             return new BigDecimal(((Number) val).longValue());
         }
-        if (val instanceof String) {
-            try {
-                return new BigDecimal((String) val);
-            } catch (Exception e) {
-                return defaultValue;
-            }
+        // don't check if it's a string in case of unchecked Number subclasses
+        try {
+            return new BigDecimal(val.toString());
+        } catch (Exception e) {
+            return defaultValue;
         }
-        return defaultValue;
     }
 
     /**
@@ -1063,19 +1061,17 @@ public BigInteger optBigInteger(String key, BigInteger defaultValue) {
                 || val instanceof Short || val instanceof Byte){
             return BigInteger.valueOf(((Number) val).longValue());
         }
-        if (val instanceof String) {
-            try {
-                // the other opt functions handle implicit conversions, i.e. 
-                // jo.put("double",1.1d);
-                // jo.optInt("double"); -- will return 1, not an error
-                // this conversion to BigDecimal then to BigInteger is to maintain
-                // that type cast support that may truncate the decimal.
-                return new BigDecimal((String) val).toBigInteger();
-            } catch (Exception e) {
-                return defaultValue;
-            }
+        // don't check if it's a string in case of unchecked Number subclasses
+        try {
+            // the other opt functions handle implicit conversions, i.e. 
+            // jo.put("double",1.1d);
+            // jo.optInt("double"); -- will return 1, not an error
+            // this conversion to BigDecimal then to BigInteger is to maintain
+            // that type cast support that may truncate the decimal.
+            return new BigDecimal(val.toString()).toBigInteger();
+        } catch (Exception e) {
+            return defaultValue;
         }
-        return defaultValue;
     }
 
     /**
