Improve LiveLibraryInfo#connectionFinishesConnecting to handle async …

…race where mid-connection disconnect can occur while a session is being handed over
artiofix · Jan 24, 2025 · 887d5e6 · 887d5e6
1 parent 5e98841
commit 887d5e6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/artio-core/src/main/java/uk/co/real_logic/artio/engine/framer/Framer.java b/artio-core/src/main/java/uk/co/real_logic/artio/engine/framer/Framer.java
@@ -1374,10 +1374,11 @@ public Action onInitiateConnection(
             channelSupplier.open(address,
                 (channel, ex) ->
                 {
+                    library.connectionFinishesConnecting(correlationId);
+
                     if (ex != null)
                     {
                         fixContexts.onDisconnect(sessionContext.sessionId());
-                        library.connectionFinishesConnecting(correlationId);
                         saveError(UNABLE_TO_CONNECT, libraryId, correlationId, ex);
                         return;
                     }
@@ -1403,6 +1404,7 @@ public Action onInitiateConnection(
         }
         catch (final Exception ex)
         {
+            library.connectionFinishesConnecting(correlationId);
             fixContexts.onDisconnect(sessionContext.sessionId());
             return saveError(UNABLE_TO_CONNECT, libraryId, correlationId, ex);
         }
@@ -3709,7 +3711,6 @@ private boolean checkDisconnectDuringHandover()
                 {
                     // Need to notify the library because it doesn't know about the session yet and it will
                     // have a reply object corresponding to the initiate() method call.
-                    library.connectionFinishesConnecting(correlationId);
                     saveError(UNABLE_TO_CONNECT, libraryId, correlationId,
                         "Disconnected before session active");
                 }
@@ -3765,7 +3766,6 @@ private long saveManageSessionInbound()
             final long position = saveManageSession(inboundPublication);
             if (position > 0)
             {
-                library.connectionFinishesConnecting(correlationId);
                 gatewaySession.play();
             }