diff --git a/JSONArray.java b/JSONArray.java index 5ccb65b79..e6ea71df7 100644 --- a/JSONArray.java +++ b/JSONArray.java @@ -593,7 +593,9 @@ public > E optEnum(Class clazz, int index, E defaultValue) return myE; } return Enum.valueOf(clazz, val.toString()); - } catch (IllegalArgumentException | NullPointerException e) { + } catch (IllegalArgumentException iae) { + return defaultValue; + } catch (NullPointerException npe) { return defaultValue; } } diff --git a/JSONObject.java b/JSONObject.java index e52a567f8..e5a37a476 100644 --- a/JSONObject.java +++ b/JSONObject.java @@ -900,7 +900,9 @@ public > E optEnum(Class clazz, String key, E defaultValue) return myE; } return Enum.valueOf(clazz, val.toString()); - } catch (IllegalArgumentException | NullPointerException e) { + } catch (IllegalArgumentException iae) { + return defaultValue; + } catch (NullPointerException npe) { return defaultValue; } }