lock cache returns the db itself to be handle as try-with-resources

dimagi · Apr 9, 2024 · ca6a5d9 · ca6a5d9
1 parent 39e1a6a
commit ca6a5d9
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/app/src/org/commcare/models/database/user/models/CommCareEntityStorageCache.java b/app/src/org/commcare/models/database/user/models/CommCareEntityStorageCache.java
@@ -20,6 +20,7 @@
 import org.commcare.suite.model.DetailField;
 import org.commcare.utils.SessionUnavailableException;
 
+import java.io.Closeable;
 import java.util.Collection;
 import java.util.Hashtable;
 import java.util.List;
@@ -72,18 +73,12 @@ public static void createIndexes(SQLiteDatabase db) {
         db.execSQL(DatabaseIndexingUtils.indexOnTableCommand("NAME_ENTITY_KEY", TABLE_NAME, COL_CACHE_NAME + ", " + COL_ENTITY_KEY + ", " + COL_CACHE_KEY));
     }
 
-    public boolean lockCache() {
+    public Closeable lockCache() {
         //Get a db handle so we can get an outer lock
-        SQLiteDatabase db;
-        try {
-            db = CommCareApplication.instance().getUserDbHandle();
-        } catch (SessionUnavailableException e) {
-            return false;
-        }
-
+        SQLiteDatabase db = CommCareApplication.instance().getUserDbHandle();
         //get the db lock
         db.beginTransaction();
-        return true;
+        return db;
     }
 
     public void releaseCache() {