From 7865fa97244d2f33d2a9c9ec359b475d6597e994 Mon Sep 17 00:00:00 2001 From: Grace Kloba Date: Fri, 19 Mar 2010 19:48:28 -0700 Subject: [PATCH] As http header can't be empty, check length before setting lastModified and etag to the cacheResult. Fix http://b/issue?id=2531047 --- core/java/android/webkit/CacheManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/java/android/webkit/CacheManager.java b/core/java/android/webkit/CacheManager.java index 1c59c10685d87..4f680e5570132 100644 --- a/core/java/android/webkit/CacheManager.java +++ b/core/java/android/webkit/CacheManager.java @@ -733,11 +733,15 @@ public final class CacheManager { ret.contentdisposition = contentDisposition; } + // lastModified and etag may be set back to http header. So they can't + // be empty string. String lastModified = headers.getLastModified(); - if (lastModified != null) ret.lastModified = lastModified; + if (lastModified != null && lastModified.length() > 0) { + ret.lastModified = lastModified; + } String etag = headers.getEtag(); - if (etag != null) ret.etag = etag; + if (etag != null && etag.length() > 0) ret.etag = etag; String cacheControl = headers.getCacheControl(); if (cacheControl != null) {