--- a/jdk/src/share/classes/sun/security/tools/KeyTool.java Tue Jun 14 12:31:31 2011 -0700
+++ b/jdk/src/share/classes/sun/security/tools/KeyTool.java Wed Jun 15 08:37:11 2011 -0700
@@ -4193,15 +4193,11 @@
return "Pair[" + fst + "," + snd + "]";
}
- private static boolean equals(Object x, Object y) {
- return (x == null && y == null) || (x != null && x.equals(y));
- }
-
public boolean equals(Object other) {
return
other instanceof Pair &&
- equals(fst, ((Pair)other).fst) &&
- equals(snd, ((Pair)other).snd);
+ Objects.equals(fst, ((Pair)other).fst) &&
+ Objects.equals(snd, ((Pair)other).snd);
}
public int hashCode() {