commit 90c50c4d7d4f33ba38d420b18e62d2e87cd503cf
author Dmitri Plotnikov <dplotnikov@google.com> Thu Jul 15 18:56:11 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 15 18:56:11 2010 -0700
tree 742919510cfc0888640db5b8863e89e6ccecb1f9
parent 6ea3b2a5dad44b1817562d24b0d11a74da72a751
parent 4565d52bdd60490b05f9f8f7c1fd3c552974948c

Merge "Fixing NPE in CursorLoader"

core/java/android/content/CursorLoader.java

diff --git a/core/java/android/content/CursorLoader.java b/core/java/android/content/CursorLoader.java
index e230394..01bf968 100644
--- a/core/java/android/content/CursorLoader.java
+++ b/core/java/android/content/CursorLoader.java
@@ -50,7 +50,9 @@
     public void deliverResult(Cursor cursor) {
         if (mStopped) {
             // An async query came in while the loader is stopped
-            cursor.close();
+            if (cursor != null) {
+                cursor.close();
+            }
             return;
         }
         mCursor = cursor;