Fix referential comparison of the two strings (#446)

chingor13 · web-flow · commit 45158d18033c · 2018-08-16T09:25:30.000-07:00
* Fix referential comparison of the two strings

* Use the Objects helper for comparisons
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
@@ -165,7 +165,7 @@ private ClassInfo(Class<?> srcClass, boolean ignoreCase) {
     // name set has a special comparator to keep null first
     TreeSet<String> nameSet = new TreeSet<String>(new Comparator<String>() {
       public int compare(String s0, String s1) {
-        return s0 == 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

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ private ClassInfo(Class<?> srcClass, boolean ignoreCase) {`
`165`	`165`	`// name set has a special comparator to keep null first`
`166`	`166`	`TreeSet<String> nameSet = new TreeSet<String>(new Comparator<String>() {`
`167`	`167`	`public int compare(String s0, String s1) {`
`168`		`- return s0 == s1 ? 0 : s0 == null ? -1 : s1 == null ? 1 : s0.compareTo(s1);`
	`168`	`+ return Objects.equal(s0, s1) ? 0 : s0 == null ? -1 : s1 == null ? 1 : s0.compareTo(s1);`
`169`	`169`	`}`
`170`	`170`	`});`
`171`	`171`	`// iterate over declared fields`