You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2017/04/15 14:44:47 UTC
[2/2] wicket git commit: Unexpected errors are logged
Unexpected errors are logged
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/59b853d0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/59b853d0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/59b853d0
Branch: refs/heads/wicket-7.x
Commit: 59b853d0c47143c52f1ecbcab0f40881e9079ac7
Parents: cb7fc6e
Author: Andrea Del Bene <an...@innoteam.it>
Authored: Mon Apr 10 11:18:26 2017 +0200
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Sat Apr 15 16:45:13 2017 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/ajax/json/JSONArray.java | 9 ++++++---
.../main/java/org/apache/wicket/ajax/json/JSONObject.java | 7 ++++++-
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/59b853d0/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONArray.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONArray.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONArray.java
index 7b07765..7886968 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONArray.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONArray.java
@@ -23,6 +23,8 @@ import java.util.Collection;
import java.util.List;
import org.apache.wicket.WicketRuntimeException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
// Note: this class was written without inspecting the non-free org.json sourcecode.
@@ -49,7 +51,8 @@ import org.apache.wicket.WicketRuntimeException;
* prohibit it" for further information.
*/
public class JSONArray {
-
+ private final static Logger log = LoggerFactory.getLogger(JSONArray.class);
+
private final List<Object> values;
/**
@@ -95,7 +98,6 @@ public class JSONArray {
if (object instanceof JSONArray) {
values = ((JSONArray) object).values;
} else {
- //noinspection ConstantConditions
throw JSON.typeMismatch(object, "JSONArray");
}
}
@@ -716,7 +718,8 @@ public class JSONArray {
try {
return toString(new JSONStringer());
} catch (JSONException e) {
- return null;
+ log.error("Unexpected exception", e);
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/59b853d0/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java
index 9834410..6a12d1b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java
@@ -28,6 +28,9 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
// Note: this class was written without inspecting the non-free org.json sourcecode.
/**
@@ -83,7 +86,8 @@ import java.util.TreeMap;
* prohibit it" for further information.
*/
public class JSONObject {
-
+ private final static Logger log = LoggerFactory.getLogger(JSONObject.class);
+
private static final Double NEGATIVE_ZERO = -0d;
/**
@@ -857,6 +861,7 @@ public class JSONObject {
try {
return toString(new JSONStringer());
} catch (JSONException e) {
+ log.error("Unexpected exception", e);
return null;
}
}