diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-10-06 14:21:12 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-10-06 14:21:12 +0000 |
| commit | 0bd603e7f7ab15346cb0f90d9e69e683008ec89d (patch) | |
| tree | 08ad96603aa91a92493b970442fb3fa036535a2a | |
| parent | c668e12c8710d0f8394e91cc1d490eb5f64b5734 (diff) | |
| parent | 21e57216e15d236764a5e00ca5614ec67d23159f (diff) | |
| download | latinime-0bd603e7f7ab15346cb0f90d9e69e683008ec89d.tar.gz latinime-0bd603e7f7ab15346cb0f90d9e69e683008ec89d.tar.xz latinime-0bd603e7f7ab15346cb0f90d9e69e683008ec89d.zip | |
am 21e57216: Merge "Fix a possible NPE in Dicttool"
* commit '21e57216e15d236764a5e00ca5614ec67d23159f':
Fix a possible NPE in Dicttool
| -rw-r--r-- | tools/dicttool/compat/android/util/Pair.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/dicttool/compat/android/util/Pair.java b/tools/dicttool/compat/android/util/Pair.java index 5bf34848d..ab6096ee3 100644 --- a/tools/dicttool/compat/android/util/Pair.java +++ b/tools/dicttool/compat/android/util/Pair.java @@ -17,6 +17,7 @@ package android.util; import java.util.Arrays; +import java.util.Objects; public class Pair<T1, T2> { public final T1 mFirst; @@ -29,7 +30,8 @@ public class Pair<T1, T2> { @Override public int hashCode() { - return Arrays.hashCode(new Object[] { mFirst, mSecond }); + return (mFirst == null ? 0 : mFirst.hashCode()) + ^ (mSecond == null ? 0 : mSecond.hashCode()); } @Override @@ -37,7 +39,6 @@ public class Pair<T1, T2> { if (o == this) return true; if (!(o instanceof Pair)) return false; Pair<?, ?> p = (Pair<?, ?>)o; - return ((mFirst == null && p.mFirst == null) || mFirst.equals(p.mFirst)) - && ((mSecond == null && p.mSecond == null) || mSecond.equals(p.mSecond)); + return Objects.equals(mFirst, p.mFirst) && Objects.equals(mSecond, p.mSecond); } } |