Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b498d2cf authored by Jean Chalard's avatar Jean Chalard
Browse files

Fix a possible NPE in Dicttool 

I've never seen the NPE happen and only happened to notice
this by chance. Let's fix the code.

Change-Id: If458646229f9cadcd6c15779348133f382fde783
parent 82065e36

tools/dicttool/compat/android/util/Pair.java

+4 −3
Original line number Diff line number Diff line
@@ -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);

    }

}