[ProviderModel] fix potential leaking cursor when no results found.

agrosner · Feb 17, 2021 · b763a77 · b763a77
1 parent 928ed90
commit b763a77
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/contentprovider/src/main/kotlin/com/dbflow5/provider/BaseProviderModel.kt b/contentprovider/src/main/kotlin/com/dbflow5/provider/BaseProviderModel.kt
@@ -48,13 +48,10 @@ abstract class BaseProviderModel : BaseModel(), ModelProvider {
  orderBy: String?,
  wrapper: DatabaseWrapper,
  vararg columns: String?): T? {
- val cursor = ContentUtils.query(FlowManager.contentResolver,
- queryUri, whereOperatorGroup, orderBy, *columns)
- if (cursor != null) {
+ ContentUtils.query(FlowManager.contentResolver,
+ queryUri, whereOperatorGroup, orderBy, *columns)?.use { cursor ->
  if (cursor.moveToFirst()) {
- val model: T = modelAdapter.loadFromCursor(cursor, wrapper) as T
- cursor.close()
- return model
+ return modelAdapter.loadFromCursor(cursor, wrapper) as T
  }
  }
  return null