Fix NPE race condition in updateDisplayCountAndDuration

Shamyyoun · Shamyyoun · commit b118df482f4a · 2026-05-11T19:16:19.000+04:00
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/EmbeddedSessionManager.kt b/iterableapi/src/main/java/com/iterable/iterableapi/EmbeddedSessionManager.kt
@@ -108,10 +108,11 @@ public class EmbeddedSessionManager {
     }
 
     private fun updateDisplayCountAndDuration(impressionData: EmbeddedImpressionData): EmbeddedImpressionData {
-        if (impressionData.start != null) {
+        val start = impressionData.start
+        if (start != null) {
             impressionData.displayCount = impressionData.displayCount.plus(1)
             impressionData.duration =
-                impressionData.duration.plus((Date().time - impressionData.start!!.time) / 1000.0)
+                impressionData.duration.plus((Date().time - start.time) / 1000.0)
                     .toFloat()
             impressionData.start = null
         }

Original file line number	Diff line number	Diff line change
`@@ -108,10 +108,11 @@ public class EmbeddedSessionManager {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`private fun updateDisplayCountAndDuration(impressionData: EmbeddedImpressionData): EmbeddedImpressionData {`
`111`		`- if (impressionData.start != null) {`
	`111`	`+ val start = impressionData.start`
	`112`	`+ if (start != null) {`
`112`	`113`	`impressionData.displayCount = impressionData.displayCount.plus(1)`
`113`	`114`	`impressionData.duration =`
`114`		`- impressionData.duration.plus((Date().time - impressionData.start!!.time) / 1000.0)`
	`115`	`+ impressionData.duration.plus((Date().time - start.time) / 1000.0)`
`115`	`116`	`.toFloat()`
`116`	`117`	`impressionData.start = null`
`117`	`118`	`}`