From 6270ac9740f599ecf63fd4ebb6c9dd1ed619fcfc Mon Sep 17 00:00:00 2001 From: "joth@chromium.org" Date: Tue, 18 Jun 2013 18:06:24 +0000 Subject: Make AwContents.destroy() idempotent Follow-up to crrev.com/206516 As mCleanupReference is nulled out in destroy() it now must be null-checked to allow repeat calls to destroy(). BUG= Review URL: https://chromiumcodereview.appspot.com/17301002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207035 0039d316-1c4b-4281-b951-d872f2087c98 --- android_webview/java/src/org/chromium/android_webview/AwContents.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'android_webview/java/src') diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java index 49fb2d0..8cd9520 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java @@ -462,7 +462,7 @@ public class AwContents { // methods are called on it after it's been destroyed, and other // code relies on AwContents.mContentViewCore to be non-null. - mCleanupReference.cleanupNow(); + if (mCleanupReference != null) mCleanupReference.cleanupNow(); mNativeAwContents = 0; mCleanupReference = null; } -- cgit v1.1