From b10fe8aece1309a2aaf6e8437b0d3e9e1cc2d1f3 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 15 Aug 2018 16:32:26 -0700 Subject: [PATCH 1/2] Fix referential comparison of the two strings --- .../src/main/java/com/google/api/client/util/ClassInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java b/google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java index 6974e72de..0a647df47 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java +++ b/google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java @@ -165,7 +165,7 @@ private ClassInfo(Class srcClass, boolean ignoreCase) { // name set has a special comparator to keep null first TreeSet nameSet = new TreeSet(new Comparator() { public int compare(String s0, String s1) { - return s0 == s1 ? 0 : s0 == null ? -1 : s1 == null ? 1 : s0.compareTo(s1); + return s0.equals(s1) ? 0 : s0 == null ? -1 : s1 == null ? 1 : s0.compareTo(s1); } }); // iterate over declared fields From 9ee13992d18bb8d9aab7d1682dadba5159ed161d Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 15 Aug 2018 16:49:29 -0700 Subject: [PATCH 2/2] Use the Objects helper for comparisons --- .../src/main/java/com/google/api/client/util/ClassInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java b/google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java index 0a647df47..16c71dda7 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java +++ b/google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java @@ -165,7 +165,7 @@ private ClassInfo(Class srcClass, boolean ignoreCase) { // name set has a special comparator to keep null first TreeSet nameSet = new TreeSet(new Comparator() { public int compare(String s0, String s1) { - return s0.equals(s1) ? 0 : s0 == null ? -1 : s1 == null ? 1 : s0.compareTo(s1); + return Objects.equal(s0, s1) ? 0 : s0 == null ? -1 : s1 == null ? 1 : s0.compareTo(s1); } }); // iterate over declared fields