am baaf136: am 0a3fcc3: Fix Apache stack

jreck · Android Git Automerger · commit 6b9a41c55ef9 · 2012-01-12T11:03:06.000-08:00
* commit 'baaf136cd279e22a7ae4b551ebd5fad23b84996d':
  Fix Apache stack
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java
@@ -869,6 +869,7 @@ private LoadListener startLoadingResource(int loaderHandle,
         loader.setCacheMode(headers.containsKey("If-Modified-Since")
                 || headers.containsKey("If-None-Match") ? 
                         WebSettings.LOAD_NO_CACHE : cacheMode);
+        loader.executeLoad();
         // Set referrer to current URL?
         return !synchronous ? loadListener : null;
     }

Original file line number	Diff line number	Diff line change
`@@ -869,6 +869,7 @@ private LoadListener startLoadingResource(int loaderHandle,`
`869`	`869`	`loader.setCacheMode(headers.containsKey("If-Modified-Since")`
`870`	`870`	`\|\| headers.containsKey("If-None-Match") ?`
`871`	`871`	`WebSettings.LOAD_NO_CACHE : cacheMode);`
	`872`	`+ loader.executeLoad();`
`872`	`873`	`// Set referrer to current URL?`
`873`	`874`	`return !synchronous ? loadListener : null;`
`874`	`875`	`}`