From 4565d52bdd60490b05f9f8f7c1fd3c552974948c Mon Sep 17 00:00:00 2001
From: Dmitri Plotnikov <dplotnikov@google.com>
Date: Thu, 15 Jul 2010 18:24:07 -0700
Subject: [PATCH] Fixing NPE in CursorLoader

Change-Id: I8d005473166f43dd018ac304ff9ec606e90483a3
---
 core/java/android/content/CursorLoader.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/content/CursorLoader.java b/core/java/android/content/CursorLoader.java
index e2303940f5ec8..01bf9686412ac 100644
--- a/core/java/android/content/CursorLoader.java
+++ b/core/java/android/content/CursorLoader.java
@@ -50,7 +50,9 @@ public class CursorLoader extends AsyncTaskLoader<Cursor> {
     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;