Fixed incorrect cast getting float from array

ianlovejoy · ianlovejoy · commit 75894086e59d · 2021-04-27T19:03:35.000-07:00
Added test for getting float from array
diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
@@ -326,7 +326,7 @@ public double getDouble(int index) throws JSONException {
     public float getFloat(int index) throws JSONException {
         final Object object = this.get(index);
         if(object instanceof Number) {
-            return ((Float)object).floatValue();
+            return ((Number)object).floatValue();
         }
         try {
             return Float.parseFloat(object.toString());
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -364,6 +364,8 @@ public void getArrayValues() {
                 new Double(23.45e-4).equals(jsonArray.getDouble(5)));
         assertTrue("Array string double",
                 new Double(23.45).equals(jsonArray.getDouble(6)));
+        assertTrue("Array double can be float",
+                new Float(23.45e-4f).equals(jsonArray.getFloat(5)));
         // ints
         assertTrue("Array value int",
                 new Integer(42).equals(jsonArray.getInt(7)));

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ public double getDouble(int index) throws JSONException {`
`326`	`326`	`public float getFloat(int index) throws JSONException {`
`327`	`327`	`final Object object = this.get(index);`
`328`	`328`	`if(object instanceof Number) {`
`329`		`- return ((Float)object).floatValue();`
	`329`	`+ return ((Number)object).floatValue();`
`330`	`330`	`}`
`331`	`331`	`try {`
`332`	`332`	`return Float.parseFloat(object.toString());`