Merge pull request #195 from publishing-systems/master

Java 1.6 compatibility.
stleary · Feb 13, 2016 · 07a0f60 · 07a0f60
2 parents ba2585f + 60349ec
commit 07a0f60
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/JSONArray.java b/JSONArray.java
@@ -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;
         }
     }

diff --git a/JSONObject.java b/JSONObject.java
@@ -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;
         }
     }