summaryrefslogtreecommitdiffstats
path: root/android_webview/java
diff options
context:
space:
mode:
authorigsolla <igsolla@chromium.org>2014-10-02 03:09:09 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-02 10:09:50 +0000
commitc2401a37a0ba385317e71cb430356458328a12df (patch)
treec4c737ab3b4550f7ca1e6222f7fc5f06e21f772e /android_webview/java
parent4db84b031042bf4f99720372f657ff53e4503a16 (diff)
downloadchromium_src-c2401a37a0ba385317e71cb430356458328a12df.zip
chromium_src-c2401a37a0ba385317e71cb430356458328a12df.tar.gz
chromium_src-c2401a37a0ba385317e71cb430356458328a12df.tar.bz2
Add missing null-checks.
These null-checks were inadvertedly removed during this refactoring: https://codereview.chromium.org/481803004/ getWebContents() can return null after destruction so we need to null-check before use. BUG=415666 Review URL: https://codereview.chromium.org/615883003 Cr-Commit-Position: refs/heads/master@{#297795}
Diffstat (limited to 'android_webview/java')
-rw-r--r--android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java b/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
index e0a7a94..1746eb0 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
@@ -147,6 +147,8 @@ class AwWebContentsDelegateAdapter extends AwWebContentsDelegate {
final Handler handler = new Handler(ThreadUtils.getUiThreadLooper()) {
@Override
public void handleMessage(Message msg) {
+ if (contentViewCore.getWebContents() == null) return;
+
switch(msg.what) {
case msgContinuePendingReload: {
contentViewCore.getWebContents().getNavigationController()