From f7d21d5472a0f4b4f3f3df8f0a56d1f367157f7e Mon Sep 17 00:00:00 2001
From: Jin Kwon <onacit@gmail.com>
Date: Thu, 10 Dec 2015 01:09:28 +0900
Subject: [PATCH] multi-catch fixed for source release compatibility 1.6

---
 JSONArray.java  | 4 +++-
 JSONObject.java | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/JSONArray.java b/JSONArray.java
index 5ccb65b79..e6ea71df7 100644
--- a/JSONArray.java
+++ b/JSONArray.java
@@ -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 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 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 iae) {
+            return defaultValue;
+        } catch (NullPointerException npe) {
             return defaultValue;
         }
     }