Call close on database after closing cursor

kevinsawicki · kevinsawicki · commit de033c1bda32 · 2012-07-10T15:29:53.000-07:00
diff --git a/app/src/main/java/com/github/mobile/persistence/DatabaseCache.java b/app/src/main/java/com/github/mobile/persistence/DatabaseCache.java
@@ -99,19 +99,23 @@ private <E> List<E> requestAndStore(SQLiteOpenHelper helper,
 
     private <E> List<E> loadFromDB(SQLiteOpenHelper helper,
             PersistableResource<E> persistableResource) {
-        Cursor cursor = persistableResource.getCursor(helper
-                .getReadableDatabase());
+        SQLiteDatabase db = helper.getReadableDatabase();
         try {
-            if (!cursor.moveToFirst())
-                return null;
+            Cursor cursor = persistableResource.getCursor(db);
+            try {
+                if (!cursor.moveToFirst())
+                    return null;
 
-            List<E> cached = new ArrayList<E>();
-            do {
-                cached.add(persistableResource.loadFrom(cursor));
-            } while (cursor.moveToNext());
-            return cached;
+                List<E> cached = new ArrayList<E>();
+                do {
+                    cached.add(persistableResource.loadFrom(cursor));
+                } while (cursor.moveToNext());
+                return cached;
+            } finally {
+                cursor.close();
+            }
         } finally {
-            cursor.close();
+            db.close();
         }
     }
 
