Remove crash point

vapor · Aug 24, 2023 · 4f028cb · 4f028cb
1 parent 11dd442
commit 4f028cb
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/Sources/Vapor/HTTP/Server/HTTPServer.swift b/Sources/Vapor/HTTP/Server/HTTPServer.swift
@@ -357,7 +357,7 @@ private final class HTTPServerConnection: Sendable {
             }
 
             // Set the handlers that are applied to the accepted Channels
-            .childChannelInitializer { [weak application] channel in
+            .childChannelInitializer { [unowned application] channel in
                 // add TLS handlers if configured
                 if var tlsConfiguration = configuration.tlsConfiguration {
                     // prioritize http/2
@@ -376,15 +376,11 @@ private final class HTTPServerConnection: Sendable {
                         configuration.logger.error("Could not configure TLS: \(error)")
                         return channel.close(mode: .all)
                     }
-                    let applicationBox = NIOLockedValueBox(application)
                     return channel.pipeline.addHandler(tlsHandler).flatMap { _ in
                         channel.configureHTTP2SecureUpgrade(h2ChannelConfigurator: { channel in
                             channel.configureHTTP2Pipeline(
                                 mode: .server,
                                 inboundStreamInitializer: { channel in
-                                    guard let application = applicationBox.withLockedValue({ $0 }) else {
-                                        fatalError("Application has been deinitialized")
-                                    }
                                     return channel.pipeline.addVaporHTTP2Handlers(
                                         application: application,
                                         responder: responder,
@@ -393,9 +389,6 @@ private final class HTTPServerConnection: Sendable {
                                 }
                             ).map { _ in }
                         }, http1ChannelConfigurator: { channel in
-                            guard let application = applicationBox.withLockedValue({ $0 }) else {
-                                fatalError("Application has been deinitialized")
-                            }
                             return channel.pipeline.addVaporHTTP1Handlers(
                                 application: application,
                                 responder: responder,
@@ -408,7 +401,7 @@ private final class HTTPServerConnection: Sendable {
                         fatalError("Plaintext HTTP/2 (h2c) not yet supported.")
                     }
                     return channel.pipeline.addVaporHTTP1Handlers(
-                        application: application!,
+                        application: application,
                         responder: responder,
                         configuration: configuration
                     )