Perform null check inside the synchronized block

darshanparajuli · Aug 19, 2018 · 4a99b9e · 4a99b9e
1 parent 8530593
commit 4a99b9e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/src/main/java/com/dp/logcatapp/db/MyDB.kt b/app/src/main/java/com/dp/logcatapp/db/MyDB.kt
@@ -63,16 +63,16 @@ abstract class MyDB : RoomDatabase() {
         private var instance: MyDB? = null
 
         fun getInstance(context: Context): MyDB {
-            if (instance == null) {
-                synchronized(MyDB::class) {
+            synchronized(MyDB::class) {
+                if (instance == null) {
                     instance = Room.databaseBuilder(context.applicationContext,
                             MyDB::class.java, DB_NAME)
                             .addMigrations(MIGRATION_1_2)
                             .fallbackToDestructiveMigration()
                             .build()
                 }
+                return instance!!
             }
-            return instance!!
         }
 
         private val MIGRATION_1_2 = object : Migration(1, 2) {