[TH2-4351] Check status when submitting events

th2-net · Feb 2, 2023 · 15bb5ee · 15bb5ee
1 parent 62277d8
commit 15bb5ee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main/kotlin/com/exactpro/th2/check1/AbstractSessionObserver.kt b/src/main/kotlin/com/exactpro/th2/check1/AbstractSessionObserver.kt
@@ -15,6 +15,7 @@ package com.exactpro.th2.check1
 import io.reactivex.observers.DisposableObserver
 import mu.KotlinLogging
 import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 abstract class AbstractSessionObserver<T> : DisposableObserver<T>() {
     override fun onComplete() {
@@ -27,6 +28,6 @@ abstract class AbstractSessionObserver<T> : DisposableObserver<T>() {
 
     companion object {
         @JvmField
-        val LOGGER: Logger = KotlinLogging.logger { }
+        val LOGGER: Logger = LoggerFactory.getLogger(AbstractSessionObserver::class.java)
     }
 }
diff --git a/src/main/kotlin/com/exactpro/th2/check1/rule/AbstractCheckTask.kt b/src/main/kotlin/com/exactpro/th2/check1/rule/AbstractCheckTask.kt
@@ -361,7 +361,14 @@ abstract class AbstractCheckTask(
 
     private fun taskFinished() {
         try {
-            val currentState = taskState.get()
+            val currentState = taskState.updateAndGet {
+                when (it) {
+                    // When we complete because of the stream completion the unsubscribe method might be called before the complete method
+                    // Because of that we need to check the status and use the completion status if we are still in BEGIN state
+                    State.BEGIN -> streamCompletedState
+                    else -> it
+                }
+            }
             LOGGER.info("Finishes task '$description' in state ${currentState.name}")
             if (currentState.callOnTimeoutCallback) {
                 callOnTimeoutCallback()