Remove unneeded calls to SQLiteDatabase.close

kevinsawicki · kevinsawicki · commit 3e2eaf402df3 · 2012-07-11T13:58:24.000-07:00
The SQLiteOpenHelper is always closed in a finally
block and closing the database is handled there.
diff --git a/app/src/main/java/com/github/mobile/persistence/DatabaseCache.java b/app/src/main/java/com/github/mobile/persistence/DatabaseCache.java
@@ -126,16 +126,12 @@ private <E> List<E> requestAndStore(final SQLiteOpenHelper helper,
         if (db == null)
             return items;
 
+        db.beginTransaction();
         try {
-            db.beginTransaction();
-            try {
-                persistableResource.store(db, items);
-                db.setTransactionSuccessful();
-            } finally {
-                db.endTransaction();
-            }
+            persistableResource.store(db, items);
+            db.setTransactionSuccessful();
         } finally {
-            db.close();
+            db.endTransaction();
         }
         return items;
     }
@@ -146,22 +142,18 @@ private <E> List<E> loadFromDB(final SQLiteOpenHelper helper,
         if (db == null)
             return null;
 
+        Cursor cursor = persistableResource.getCursor(db);
         try {
-            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;
-            } finally {
-                cursor.close();
-            }
+            if (!cursor.moveToFirst())
+                return null;
+
+            List<E> cached = new ArrayList<E>();
+            do {
+                cached.add(persistableResource.loadFrom(cursor));
+            } while (cursor.moveToNext());
+            return cached;
         } finally {
-            db.close();
+            cursor.close();
         }
     }
 
