From e5bcd3cb1ad00adf7af8365910674dcc413145f7 Mon Sep 17 00:00:00 2001 From: nathan Date: Fri, 11 Sep 2020 02:02:46 +0200 Subject: [PATCH] Fixed out-of-order initialization of aeron dir --- src/dorkbox/network/aeron/AeronConfig.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dorkbox/network/aeron/AeronConfig.kt b/src/dorkbox/network/aeron/AeronConfig.kt index 36c692f1..7c166160 100644 --- a/src/dorkbox/network/aeron/AeronConfig.kt +++ b/src/dorkbox/network/aeron/AeronConfig.kt @@ -174,12 +174,12 @@ internal object AeronConfig { fun createContext(config: Configuration, logger: KLogger = KotlinLogging.logger("AeronConfig")): MediaDriver.Context { var context = create(config, logger) - // will setup the aeron directory or throw IllegalArgumentException if it cannot be configured - var aeronDir = context.aeronDirectory() - // this happens EXACTLY once. Must be BEFORE the "isRunning" check! context.concludeAeronDirectory() + // will setup the aeron directory or throw IllegalArgumentException if it cannot be configured + var aeronDir = context.aeronDirectory() + var isRunning = isRunning(context) // this is incompatible with IPC, and will not be set if IPC is enabled