commit 0409857f8ff1b140733537db4bf56ccc663318e7
author Andrei Popescu <andreip@google.com> Tue Mar 09 12:23:19 2010 +0000
committer Andrei Popescu <andreip@google.com> Tue Mar 09 18:04:35 2010 +0000
tree 55d0c175ad42584cc7cbaff69ac53fd8b83571c8
parent abf19abe4808114cae3f274773a267603f18c923

Make sure access to WebView::mWebViewCore is synchronized.

Fix bug: 2498784

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 6079a37..e81fec4 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -1125,9 +1125,11 @@
             mCallbackProxy.setWebViewClient(null);
             mCallbackProxy.setWebChromeClient(null);
             // Tell WebViewCore to destroy itself
-            WebViewCore webViewCore = mWebViewCore;
-            mWebViewCore = null; // prevent using partial webViewCore
-            webViewCore.destroy();
+            synchronized (this) {
+                WebViewCore webViewCore = mWebViewCore;
+                mWebViewCore = null; // prevent using partial webViewCore
+                webViewCore.destroy();
+            }
             // Remove any pending messages that might not be serviced yet.
             mPrivateHandler.removeCallbacksAndMessages(null);
             mCallbackProxy.removeCallbacksAndMessages(null);
@@ -5842,7 +5844,7 @@
                 cursorData(), 1000);
     }
 
-    /* package */ WebViewCore getWebViewCore() {
+    /* package */ synchronized WebViewCore getWebViewCore() {
         return mWebViewCore;
     }