commit 9eb06a951d5af73e4f265b5129b4eae283ee9e8d
author John Reck <jreck@google.com> Mon Mar 14 18:16:29 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 14 18:16:29 2011 -0700
tree 0e4ef81af81360949b20790a2b6a6a75f85a685a
parent 1965a18a0f1e2e8e253558adcbe218c0b1957f68
parent dedad7c599e2a27b8176bc128734ec1ba2edbfc2

am dedad7c5: Merge "Add null check" into honeycomb-mr1

* commit 'dedad7c599e2a27b8176bc128734ec1ba2edbfc2':
  Add null check

src/com/android/browser/BrowserBookmarksPage.java

diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index 98b25a8..de28d0d 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -453,7 +453,7 @@
     }
 
     private void loadUrl(int position) {
-        if (mCallbacks != null) {
+        if (mCallbacks != null && mAdapter != null) {
             mCallbacks.onBookmarkSelected(mAdapter.getItem(position), false);
         }
     }