From ef32ee3db8c1c48894ce62cd8e151d7fa8501c86 Mon Sep 17 00:00:00 2001
From: Grace Kloba <klobag@google.com>
Date: Mon, 31 Aug 2009 18:43:48 -0700
Subject: [PATCH] When we get 304 and switch to cacheLoader, need to set
 mFromCache to be true. So that the cache loading will not create a new
 mCacheResult which overwrites the old cache data.

---
 core/java/android/webkit/LoadListener.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/java/android/webkit/LoadListener.java b/core/java/android/webkit/LoadListener.java
index 43c76a89580d1..1a5b2eba296ec 100644
--- a/core/java/android/webkit/LoadListener.java
+++ b/core/java/android/webkit/LoadListener.java
@@ -606,6 +606,7 @@ class LoadListener extends Handler implements EventHandler {
                 // before calling it.
                 if (mCacheLoader != null) {
                     mCacheLoader.load();
+                    mFromCache = true;
                     if (DebugFlags.LOAD_LISTENER) {
                         Log.v(LOGTAG, "LoadListener cache load url=" + url());
                     }