resolve conflicts

Signed-off-by: Lachlan Roberts <[email protected]>
GoogleCloudPlatform · Nov 19, 2024 · c669f96 · c669f96
1 parent cb825b1
commit c669f96
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/..._jetty9/src/main/java/com/google/apphosting/runtime/jetty9/JettyServletEngineAdapter.java b/..._jetty9/src/main/java/com/google/apphosting/runtime/jetty9/JettyServletEngineAdapter.java
@@ -43,6 +43,7 @@
 import java.util.Optional;
 import javax.servlet.ServletException;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.SizeLimitHandler;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 
@@ -143,11 +144,11 @@ public void start(String serverInfo, ServletEngineAdapter.Config runtimeOptions)
           logger.atInfo().log("Using HTTP_CONNECTOR_MODE to bypass RPC");
           appVersionKey = AppVersionKey.fromAppInfo(appinfo);
           AppVersion appVersion = appVersionHandlerMap.getAppVersion(appVersionKey);
-          JettyHttpProxy.insertHandlers(server, ignoreResponseSizeLimit);
-          server.addConnector(JettyHttpProxy.newConnector(server, runtimeOptions));
+          ServerConnector connector = JettyHttpProxy.newConnector(server, runtimeOptions);
+          server.addConnector(connector);
           server.insertHandler(
-              new JettyHttpHandler(
-                  runtimeOptions, appVersion, appVersionKey, appInfoFactory, connector));
+              new JettyHttpHandler(runtimeOptions, appVersion, appVersionKey, appInfoFactory, connector));
+          JettyHttpProxy.insertHandlers(server, ignoreResponseSizeLimit);
         } else {
           server.setAttribute(
               "com.google.apphosting.runtime.jetty9.appYaml",