Merge pull request #80 from Malinskiy/fix/vertx-shutdown-behaviour

fix(adam): fix vertx socket factory crash during shutdown
Malinskiy · Apr 21, 2022 · 0172564 · 0172564
2 parents 652f039 + 50836dc
commit 0172564
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/adam/src/main/kotlin/com/malinskiy/adam/transport/vertx/VertxSocketFactory.kt b/adam/src/main/kotlin/com/malinskiy/adam/transport/vertx/VertxSocketFactory.kt
@@ -23,12 +23,16 @@ import io.vertx.core.net.NetClientOptions
 import io.vertx.core.net.SocketAddress
 import io.vertx.kotlin.coroutines.await
 import java.net.InetSocketAddress
+import java.util.concurrent.atomic.AtomicBoolean
 
 class VertxSocketFactory(
     private val connectTimeout: Long = 10_000,
     private val idleTimeout: Long = 30_000
 ) : SocketFactory {
-    private val vertx by lazy { Vertx.vertx() }
+    private val vertx by lazy {
+        Vertx.vertx().also { initialized.set(true) }
+    }
+    private val initialized = AtomicBoolean(false)
 
     override suspend fun tcp(socketAddress: InetSocketAddress, connectTimeout: Long?, idleTimeout: Long?): Socket {
         val vertxSocket = VertxSocket(SocketAddress.inetSocketAddress(socketAddress), NetClientOptions().apply {
@@ -41,7 +45,9 @@ class VertxSocketFactory(
     }
 
     override fun close() {
-        vertx.close()
+        if (initialized.get()) {
+            vertx.close()
+        }
     }
 
     private fun Long.toTimeoutInt(): Int {

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,5 +1,5 @@
 object Versions {
-    val adam = System.getenv("GIT_TAG_NAME") ?: "0.4.3"
+    val adam = System.getenv("GIT_TAG_NAME") ?: "0.4.5"
     val kotlin = "1.6.10"
     val coroutines = "1.6.0"
     val coroutinesDebug = coroutines