Fix crash when recreating minimal connections (#480)

vapor · May 30, 2024 · ee669e9 · ee669e9
1 parent d379584
commit ee669e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Sources/ConnectionPoolModule/PoolStateMachine+ConnectionGroup.swift b/Sources/ConnectionPoolModule/PoolStateMachine+ConnectionGroup.swift
@@ -592,7 +592,7 @@ extension PoolStateMachine {
 
             let newConnectionRequest: ConnectionRequest?
             if self.connections.count < self.minimumConcurrentConnections {
-                newConnectionRequest = .init(connectionID: self.generator.next())
+                newConnectionRequest = self.createNewConnection()
             } else {
                 newConnectionRequest = .none
             }

diff --git a/Tests/ConnectionPoolModuleTests/PoolStateMachineTests.swift b/Tests/ConnectionPoolModuleTests/PoolStateMachineTests.swift
@@ -375,6 +375,10 @@ final class PoolStateMachineTests: XCTestCase {
         let connectionClosed = stateMachine.connectionClosed(connection)
         XCTAssertEqual(connectionClosed.connection, .makeConnection(.init(connectionID: 1), []))
         connection.closeIfClosing()
+        let establishAction = stateMachine.connectionEstablished(.init(id: 1), maxStreams: 1)
+        XCTAssertEqual(establishAction.request, .none)
+        guard case .scheduleTimers(let timers) = establishAction.connection else { return XCTFail("Unexpected connection action") }
+        XCTAssertEqual(timers, [.init(.init(timerID: 0, connectionID: 1, usecase: .keepAlive), duration: configuration.keepAliveDuration!)])
     }
 
 }