[DB] openhelper is lazy

agrosner · Feb 18, 2021 · 5ad4d86 · 5ad4d86
1 parent a4b3680
commit 5ad4d86
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/lib/src/main/kotlin/com/dbflow5/config/DBFlowDatabase.kt b/lib/src/main/kotlin/com/dbflow5/config/DBFlowDatabase.kt
@@ -133,21 +133,20 @@ abstract class DBFlowDatabase : DatabaseWrapper {
 
  internal var writeAheadLoggingEnabled = false
 
- val openHelper: OpenHelper
- @Synchronized get() {
- var helper = _openHelper
- if (helper == null) {
- val config = FlowManager.getConfig().databaseConfigMap[associatedDatabaseClassFile]
- helper = if (config?.openHelperCreator != null) {
- config.openHelperCreator.createHelper(this, internalCallback)
- } else {
- AndroidSQLiteOpenHelper(FlowManager.context, this, internalCallback)
- }
- onOpenWithConfig(config, helper)
+ val openHelper: OpenHelper by lazy {
+ var helper = _openHelper
+ if (helper == null) {
+ val config = FlowManager.getConfig().databaseConfigMap[associatedDatabaseClassFile]
+ helper = if (config?.openHelperCreator != null) {
+ config.openHelperCreator.createHelper(this, internalCallback)
+ } else {
+ AndroidSQLiteOpenHelper(FlowManager.context, this, internalCallback)
  }
- _openHelper = helper
- return helper
+ onOpenWithConfig(config, helper)
  }
+ _openHelper = helper
+ return@lazy helper
+ }
 
  private fun onOpenWithConfig(config: DatabaseConfig?, helper: OpenHelper) {
  helper.performRestoreFromBackup()