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

Commit cd7dfcec authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Android Git Automerger
Browse files

am 40b207c1: Merge "Using proper key for removing object from the map." 

* commit '40b207c1':
  Using proper key for removing object from the map.
parents c73c4a36 40b207c1

core/java/android/net/http/CertificateValidatorCache.java

+3 −3
Original line number Diff line number Diff line
@@ -137,8 +137,8 @@ class CertificateValidatorCache { 


        if (domain != null && domain.length() != 0) {

            if (secureHash != null && secureHash.length != 0) {

                CacheEntry cacheEntry = (CacheEntry)mCacheMap.get(

                    new Integer(mBigScrew ^ domain.hashCode()));

                final Integer key = new Integer(mBigScrew ^ domain.hashCode());

                CacheEntry cacheEntry = mCacheMap.get(key);

                if (cacheEntry != null) {

                    if (!cacheEntry.expired()) {

                        rval = cacheEntry.has(domain, secureHash);
@@ -148,7 +148,7 @@ class CertificateValidatorCache { 
                        }

                        // TODO: debug only!

                    } else {

                        mCacheMap.remove(cacheEntry);

                        mCacheMap.remove(key);

                    }

                }

            }