PR #12633 - inline closeOutput method in ServletApiResponse

Signed-off-by: Lachlan Roberts <[email protected]>
jetty · Dec 12, 2024 · a40ee1e · a40ee1e
1 parent 5485450
commit a40ee1e
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/...0/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiResponse.java b/...0/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiResponse.java
@@ -186,17 +186,14 @@ public void sendRedirect(int code, String location) throws IOException
         {
             Response.sendRedirect(getServletRequestInfo().getRequest(), getResponse(), callback, code, location, false);
             callback.block();
-            closeOutput();
-        }
-    }
 
-    public void closeOutput() throws IOException
-    {
-        ServletResponseInfo info = getServletResponseInfo();
-        if (info.getOutputType() == ServletContextResponse.OutputType.WRITER)
-            info.getWriter().close();
-        else
-            _servletChannel.getHttpOutput().close();
+            // Close the HttpOutput.
+            ServletResponseInfo info = getServletResponseInfo();
+            if (info.getOutputType() == ServletContextResponse.OutputType.WRITER)
+                info.getWriter().close();
+            else
+                _servletChannel.getHttpOutput().close();
+        }
     }
 
     @Override