madsager
diff --git a/Collapse file
‎JSONArray.java‎
Copy file name to clipboardExpand all lines: JSONArray.java
+4-2Lines changed: 4 additions & 2 deletions b/Collapse file
‎JSONArray.java‎
Copy file name to clipboardExpand all lines: JSONArray.java
+4-2Lines changed: 4 additions & 2 deletions
diff --git a/Collapse file
‎JSONObject.java‎
Copy file name to clipboardExpand all lines: JSONObject.java
+4-2Lines changed: 4 additions & 2 deletions b/Collapse file
‎JSONObject.java‎
Copy file name to clipboardExpand all lines: JSONObject.java
+4-2Lines changed: 4 additions & 2 deletions
@@ -76,7 +76,7 @@ of this software and associated documentation files (the "Software"), to deal
  * </ul>
  *
  * @author JSON.org
- * @version 2015-10-29
+ * @version 2016-02-08
  */
 public class JSONArray implements Iterable<Object> {
 
@@ -593,7 +593,9 @@ public <E extends Enum<E>> E optEnum(Class<E> clazz, int index, E defaultValue)
                 return myE;
             }
             return Enum.valueOf(clazz, val.toString());
-        } catch (IllegalArgumentException | NullPointerException e) {
+        } catch (IllegalArgumentException e) {
+            return defaultValue;
+        } catch (NullPointerException e) {
             return defaultValue;
         }
     }
 
@@ -93,7 +93,7 @@ of this software and associated documentation files (the "Software"), to deal
  * </ul>
  *
  * @author JSON.org
- * @version 2015-01-30
+ * @version 2016-02-08
  */
 public class JSONObject {
     /**
@@ -901,7 +901,9 @@ public <E extends Enum<E>> E optEnum(Class<E> clazz, String key, E defaultValue)
                 return myE;
             }
             return Enum.valueOf(clazz, val.toString());
-        } catch (IllegalArgumentException | NullPointerException e) {
+        } catch (IllegalArgumentException e) {
+            return defaultValue;
+        } catch (NullPointerException e) {
             return defaultValue;
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ of this software and associated documentation files (the "Software"), to deal`
`76`	`76`	`* </ul>`
`77`	`77`	`*`
`78`	`78`	`* @author JSON.org`
`79`		`- * @version 2015-10-29`
	`79`	`+ * @version 2016-02-08`
`80`	`80`	`*/`
`81`	`81`	`public class JSONArray implements Iterable<Object> {`
`82`	`82`
`@@ -593,7 +593,9 @@ public <E extends Enum<E>> E optEnum(Class<E> clazz, int index, E defaultValue)`
`593`	`593`	`return myE;`
`594`	`594`	`}`
`595`	`595`	`return Enum.valueOf(clazz, val.toString());`
`596`		`- } catch (IllegalArgumentException \| NullPointerException e) {`
	`596`	`+ } catch (IllegalArgumentException e) {`
	`597`	`+ return defaultValue;`
	`598`	`+ } catch (NullPointerException e) {`
`597`	`599`	`return defaultValue;`
`598`	`600`	`}`
`599`	`601`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ of this software and associated documentation files (the "Software"), to deal`
`93`	`93`	`* </ul>`
`94`	`94`	`*`
`95`	`95`	`* @author JSON.org`
`96`		`- * @version 2015-01-30`
	`96`	`+ * @version 2016-02-08`
`97`	`97`	`*/`
`98`	`98`	`public class JSONObject {`
`99`	`99`	`/**`
`@@ -901,7 +901,9 @@ public <E extends Enum<E>> E optEnum(Class<E> clazz, String key, E defaultValue)`
`901`	`901`	`return myE;`
`902`	`902`	`}`
`903`	`903`	`return Enum.valueOf(clazz, val.toString());`
`904`		`- } catch (IllegalArgumentException \| NullPointerException e) {`
	`904`	`+ } catch (IllegalArgumentException e) {`
	`905`	`+ return defaultValue;`
	`906`	`+ } catch (NullPointerException e) {`
`905`	`907`	`return defaultValue;`
`906`	`908`	`}`
`907`	`909`	`}`