commit 667271dd37665a8d6d1ee430c8f2680d0f1d9c8d
author John Reck <jreck@google.com> Tue Feb 22 14:55:07 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 22 14:55:07 2011 -0800
tree d471ceeaf71dcd81c704f8c095fde9e6868c284c
parent 991bb5f8ae763265ba9ed57b0c785ecf23868d44
parent 38b4bf5f9cbb6adf2c5ca353e3b0c2a4ae9eeb87

Merge "Fix NPE in onDestroy"

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 062814b..0961f80 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -678,7 +678,7 @@
     }
 
     void onDestroy() {
-        if (!mUploadHandler.handled()) {
+        if (mUploadHandler != null && !mUploadHandler.handled()) {
             mUploadHandler.onResult(Activity.RESULT_CANCELED, null);
             mUploadHandler = null;
         }