WICKET-6287 Switch from json.org to open-json - 6.x * Resolved compile error with JDK 6, Objects is not available
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ad978211 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ad978211 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ad978211 Branch: refs/heads/wicket-6.x Commit: ad978211a5a550e7902eba354b03ec6618649579 Parents: a6bf0e2 Author: Tobias Soloschenko <[email protected]> Authored: Wed Dec 7 19:04:19 2016 +0100 Committer: Tobias Soloschenko <[email protected]> Committed: Tue Jan 3 17:55:20 2017 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/ajax/json/JSONObject.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ad978211/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 3f94a86..2cf60ee 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 @@ -27,7 +27,6 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Locale; import java.util.Map; -import java.util.Objects; import java.util.Set; import java.util.TreeMap; @@ -116,7 +115,8 @@ public class JSONObject { // at least make the broken equals(null) consistent with Objects.hashCode(null). @Override public int hashCode() { - return Objects.hashCode(null); + // replaced Objects.hashCode(null) with 0, because of Java 6 and backward compatibility + return 0; } @Override
