Merge change 1690 into donut

* changes: Rework some code so that it works the way it was supposed to work.
2009-05-14 15:32:42 -07:00
parent 9ea923174c 3537506c88
commit 1c9a92fd9f
1 changed files with 9 additions and 7 deletions
--- a/core/java/android/net/http/CertificateValidatorCache.java
+++ b/core/java/android/net/http/CertificateValidatorCache.java
@@ -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;
                }
            }