From 60349ece54204f7ee261b3e6fd2b058733dce388 Mon Sep 17 00:00:00 2001 From: skreutzer Date: Mon, 8 Feb 2016 23:30:27 -0500 Subject: [PATCH] Java 1.6 compatibility. --- JSONArray.java | 6 ++++-- JSONObject.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/JSONArray.java b/JSONArray.java index a3df975..f29085b 100644 --- a/JSONArray.java +++ b/JSONArray.java @@ -76,7 +76,7 @@ import java.util.Map; * * * @author JSON.org - * @version 2015-10-29 + * @version 2016-02-08 */ public class JSONArray implements Iterable { @@ -593,7 +593,9 @@ public class JSONArray implements Iterable { 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 index 27be3ec..1ce2540 100644 --- a/JSONObject.java +++ b/JSONObject.java @@ -93,7 +93,7 @@ import java.util.Set; * * * @author JSON.org - * @version 2015-01-30 + * @version 2016-02-08 */ public class JSONObject { /** @@ -901,7 +901,9 @@ public class JSONObject { return myE; } return Enum.valueOf(clazz, val.toString()); - } catch (IllegalArgumentException | NullPointerException e) { + } catch (IllegalArgumentException e) { + return defaultValue; + } catch (NullPointerException e) { return defaultValue; } }