Merge pull request #141 from MrIceFox/master

Add try finally blocks to close cursor and db anyway
orhanobut · Mar 24, 2016 · 5d4e691 · 5d4e691
2 parents 75e23ac + 3b2465f
commit 5d4e691
Showing 1 changed file with 46 additions and 22 deletions.
diff --git a/hawk/src/main/java/com/orhanobut/hawk/SqliteStorage.java b/hawk/src/main/java/com/orhanobut/hawk/SqliteStorage.java
@@ -92,10 +92,15 @@ public SqliteHelper(Context context, String dbName) {
 
     public synchronized boolean put(String key, String value) {
       SQLiteDatabase db = this.getWritableDatabase();
-      db.execSQL("INSERT OR REPLACE INTO " + TABLE_NAME +
-          " (" + COL_KEY + ", " + COL_VALUE + ") " +
-          " VALUES('" + key + "', '" + value + "')");
-      db.close();
+      try {
+        db.execSQL("INSERT OR REPLACE INTO " + TABLE_NAME +
+                " (" + COL_KEY + ", " + COL_VALUE + ") " +
+                " VALUES('" + key + "', '" + value + "')");
+      } catch (Exception ignored) {
+        return false;
+      } finally {
+        db.close();
+      }
       return true;
     }
 
@@ -122,9 +127,13 @@ public synchronized boolean put(List<Pair<String, ?>> list) {
 
     public synchronized boolean delete(String key) {
       SQLiteDatabase db = this.getWritableDatabase();
-      int count = db.delete(TABLE_NAME, COL_KEY + "='" + key + "'", null);
-      db.close();
-      return count != -1;
+      int count = 0;
+      try {
+        count = db.delete(TABLE_NAME, COL_KEY + "='" + key + "'", null);
+      } finally {
+        db.close();
+      }
+      return count != 0;
     }
 
     public synchronized boolean delete(String... keys) {
@@ -154,32 +163,47 @@ public synchronized boolean contains(String key) {
 
     public synchronized String get(String key) {
       SQLiteDatabase db = this.getReadableDatabase();
-      Cursor cursor = db.rawQuery("SELECT * FROM " + TABLE_NAME +
-          " WHERE " + COL_KEY + " = '" + key + "'", null);
-      if (cursor == null) {
-        return null;
-      }
-      cursor.moveToFirst();
-      if (cursor.getCount() == 0) {
-        return null;
+      Cursor cursor = null;
+      String value = null;
+      try {
+        cursor = db.rawQuery("SELECT * FROM " + TABLE_NAME +
+                " WHERE " + COL_KEY + " = '" + key + "'", null);
+        if (cursor == null) {
+          return null;
+        }
+        if (!cursor.moveToFirst()) {
+          return null;
+        }
+        value = cursor.getString(1);
+      } finally {
+        if (cursor != null) {
+          cursor.close();
+        }
+        db.close();
       }
-      String value = cursor.getString(1);
-      cursor.close();
-      db.close();
       return value;
     }
 
     public synchronized boolean clearAll() {
       SQLiteDatabase db = this.getWritableDatabase();
-      db.execSQL("DELETE FROM " + TABLE_NAME);
-      db.close();
+      try {
+        db.execSQL("DELETE FROM " + TABLE_NAME);
+      } catch (Exception ignored) {
+        return false;
+      } finally {
+        db.close();
+      }
       return true;
     }
 
     public synchronized long count() {
       SQLiteDatabase db = this.getWritableDatabase();
-      long count = DatabaseUtils.queryNumEntries(db, TABLE_NAME);
-      db.close();
+      long count = 0;
+      try {
+        count = DatabaseUtils.queryNumEntries(db, TABLE_NAME);
+      } finally {
+        db.close();
+      }
       return count;
     }
   }