Merge pull request #604 from ianlovejoy/master

Fixed incorrect cast getting float from array
This commit is contained in:
Sean Leary 2021-05-01 08:50:54 -05:00 committed by GitHub
commit 143db39d27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions

View File

@ -326,7 +326,7 @@ public class JSONArray implements Iterable<Object> {
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());

View File

@ -364,6 +364,8 @@ public class JSONArrayTest {
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)));