Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1c9a92fd: Merge change 1690 into donut

Browse Source 
Merge commit '1c9a92fd9fbe192f24e53c26cddeab401cefb108'

* commit '1c9a92fd9fbe192f24e53c26cddeab401cefb108':
  Rework some code so that it works the way it was supposed to work.
This commit is contained in:
Android (Google) Code Review
2009-05-14 15:40:01 -07:00
committed by The Android Open Source Project
parent 80a538d656 1c9a92fd9f
commit 67fd6d50af
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/net/http/CertificateValidatorCache.java
View File

@@ -236,15 +236,17 @@ class CertificateValidatorCache {
}
}
int hashLength = secureHash.length;
if (secureHash != null && 0 < hashLength) {
if (hashLength == mHash.length) {
for (int i = 0; i < hashLength; ++i) {
if (secureHash[i] != mHash[i]) {
return false;
if (secureHash != null) {
int hashLength = secureHash.length;
if (0 < hashLength) {
if (hashLength == mHash.length) {
for (int i = 0; i < hashLength; ++i) {
if (secureHash[i] != mHash[i]) {
return false;
}
}
return true;
}
return true;
}
}