* Missed JSONArray optFloat and optDouble for the revert

John J. Aylward · John J. Aylward · commit 04d6e83fc215 · 2017-05-19T09:49:22.000-04:00
* prevents erasure of stack trace for rethrown exceptions
diff --git a/JSONArray.java b/JSONArray.java
@@ -244,7 +244,7 @@ public double getDouble(int index) throws JSONException {
             return object instanceof Number ? ((Number) object).doubleValue()
                     : Double.parseDouble((String) object);
         } catch (Exception e) {
-            throw new JSONException("JSONArray[" + index + "] is not a number.");
+            throw new JSONException("JSONArray[" + index + "] is not a number.", e);
         }
     }
 
@@ -287,7 +287,7 @@ public Number getNumber(int index) throws JSONException {
             }
             return JSONObject.stringToNumber(object.toString());
         } catch (Exception e) {
-            throw new JSONException("JSONArray[" + index + "] is not a number.");
+            throw new JSONException("JSONArray[" + index + "] is not a number.", e);
         }
     }
 
@@ -331,7 +331,7 @@ public BigDecimal getBigDecimal (int index) throws JSONException {
             return new BigDecimal(object.toString());
         } catch (Exception e) {
             throw new JSONException("JSONArray[" + index +
-                    "] could not convert to BigDecimal.");
+                    "] could not convert to BigDecimal.", e);
         }
     }
 
@@ -351,7 +351,7 @@ public BigInteger getBigInteger (int index) throws JSONException {
             return new BigInteger(object.toString());
         } catch (Exception e) {
             throw new JSONException("JSONArray[" + index +
-                    "] could not convert to BigInteger.");
+                    "] could not convert to BigInteger.", e);
         }
     }
 
@@ -370,7 +370,7 @@ public int getInt(int index) throws JSONException {
             return object instanceof Number ? ((Number) object).intValue()
                     : Integer.parseInt((String) object);
         } catch (Exception e) {
-            throw new JSONException("JSONArray[" + index + "] is not a number.");
+            throw new JSONException("JSONArray[" + index + "] is not a number.", e);
         }
     }
 
@@ -426,7 +426,7 @@ public long getLong(int index) throws JSONException {
             return object instanceof Number ? ((Number) object).longValue()
                     : Long.parseLong((String) object);
         } catch (Exception e) {
-            throw new JSONException("JSONArray[" + index + "] is not a number.");
+            throw new JSONException("JSONArray[" + index + "] is not a number.", e);
         }
     }
 
@@ -569,7 +569,7 @@ public double optDouble(int index, double defaultValue) {
         }
         if (val instanceof String) {
             try {
-                return new BigDecimal((String) val).doubleValue();
+                return Double.parseDouble((String) val);
             } catch (Exception e) {
                 return defaultValue;
             }
@@ -611,7 +611,7 @@ public float optFloat(int index, float defaultValue) {
         }
         if (val instanceof String) {
             try {
-                return new BigDecimal((String) val).floatValue();
+                return Float.parseFloat((String) val);
             } catch (Exception e) {
                 return defaultValue;
             }

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ public double getDouble(int index) throws JSONException {`
`244`	`244`	`return object instanceof Number ? ((Number) object).doubleValue()`
`245`	`245`	`: Double.parseDouble((String) object);`
`246`	`246`	`} catch (Exception e) {`
`247`		`- throw new JSONException("JSONArray[" + index + "] is not a number.");`
	`247`	`+ throw new JSONException("JSONArray[" + index + "] is not a number.", e);`
`248`	`248`	`}`
`249`	`249`	`}`
`250`	`250`
`@@ -287,7 +287,7 @@ public Number getNumber(int index) throws JSONException {`
`287`	`287`	`}`
`288`	`288`	`return JSONObject.stringToNumber(object.toString());`
`289`	`289`	`} catch (Exception e) {`
`290`		`- throw new JSONException("JSONArray[" + index + "] is not a number.");`
	`290`	`+ throw new JSONException("JSONArray[" + index + "] is not a number.", e);`
`291`	`291`	`}`
`292`	`292`	`}`
`293`	`293`
`@@ -331,7 +331,7 @@ public BigDecimal getBigDecimal (int index) throws JSONException {`
`331`	`331`	`return new BigDecimal(object.toString());`
`332`	`332`	`} catch (Exception e) {`
`333`	`333`	`throw new JSONException("JSONArray[" + index +`
`334`		`- "] could not convert to BigDecimal.");`
	`334`	`+ "] could not convert to BigDecimal.", e);`
`335`	`335`	`}`
`336`	`336`	`}`
`337`	`337`
`@@ -351,7 +351,7 @@ public BigInteger getBigInteger (int index) throws JSONException {`
`351`	`351`	`return new BigInteger(object.toString());`
`352`	`352`	`} catch (Exception e) {`
`353`	`353`	`throw new JSONException("JSONArray[" + index +`
`354`		`- "] could not convert to BigInteger.");`
	`354`	`+ "] could not convert to BigInteger.", e);`
`355`	`355`	`}`
`356`	`356`	`}`
`357`	`357`
`@@ -370,7 +370,7 @@ public int getInt(int index) throws JSONException {`
`370`	`370`	`return object instanceof Number ? ((Number) object).intValue()`
`371`	`371`	`: Integer.parseInt((String) object);`
`372`	`372`	`} catch (Exception e) {`
`373`		`- throw new JSONException("JSONArray[" + index + "] is not a number.");`
	`373`	`+ throw new JSONException("JSONArray[" + index + "] is not a number.", e);`
`374`	`374`	`}`
`375`	`375`	`}`
`376`	`376`
`@@ -426,7 +426,7 @@ public long getLong(int index) throws JSONException {`
`426`	`426`	`return object instanceof Number ? ((Number) object).longValue()`
`427`	`427`	`: Long.parseLong((String) object);`
`428`	`428`	`} catch (Exception e) {`
`429`		`- throw new JSONException("JSONArray[" + index + "] is not a number.");`
	`429`	`+ throw new JSONException("JSONArray[" + index + "] is not a number.", e);`
`430`	`430`	`}`
`431`	`431`	`}`
`432`	`432`
`@@ -569,7 +569,7 @@ public double optDouble(int index, double defaultValue) {`
`569`	`569`	`}`
`570`	`570`	`if (val instanceof String) {`
`571`	`571`	`try {`
`572`		`- return new BigDecimal((String) val).doubleValue();`
	`572`	`+ return Double.parseDouble((String) val);`
`573`	`573`	`} catch (Exception e) {`
`574`	`574`	`return defaultValue;`
`575`	`575`	`}`
`@@ -611,7 +611,7 @@ public float optFloat(int index, float defaultValue) {`
`611`	`611`	`}`
`612`	`612`	`if (val instanceof String) {`
`613`	`613`	`try {`
`614`		`- return new BigDecimal((String) val).floatValue();`
	`614`	`+ return Float.parseFloat((String) val);`
`615`	`615`	`} catch (Exception e) {`
`616`	`616`	`return defaultValue;`
`617`	`617`	`}`