Merge pull request #543 from Arneball/master

Not every access has to be synchronized, and return type should not be nullable.
matomo-org · Nov 5, 2024 · 862add4 · 862add4
2 parents 47858ff + 0745ca3
commit 862add4
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/tracker/src/main/java/org/matomo/sdk/Matomo.kt b/tracker/src/main/java/org/matomo/sdk/Matomo.kt
@@ -63,12 +63,12 @@ class Matomo private constructor(context: Context) {
         private var sInstance: Matomo? = null
 
         @JvmStatic
-        @Synchronized
-        fun getInstance(context: Context): Matomo? {
-            if (sInstance == null) {
-                synchronized(Matomo::class.java) { if (sInstance == null) sInstance = Matomo(context) }
+        fun getInstance(context: Context): Matomo {
+            return sInstance ?: synchronized(Matomo::class.java) {
+                sInstance ?: Matomo(context).also {
+                    sInstance = it
+                }
             }
-            return sInstance
         }
 
         @JvmStatic