This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 8a5d6762aa ActionCode.ACK does not throw IOException. Remove
unnecessary code.
8a5d6762aa is described below
commit 8a5d6762aa543a24f8c403c1af7e631b601d7ad3
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Jul 4 14:40:36 2024 +0100
ActionCode.ACK does not throw IOException. Remove unnecessary code.
Note this is binary (but not source) backwards compatible
---
java/org/apache/catalina/connector/Response.java | 4 +---
java/org/apache/catalina/core/LocalStrings.properties | 2 --
java/org/apache/catalina/core/StandardContextValve.java | 13 +------------
3 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/catalina/connector/Response.java
b/java/org/apache/catalina/connector/Response.java
index bfbaffb123..21fc8f1138 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -1021,10 +1021,8 @@ public class Response implements HttpServletResponse {
*
* @param continueResponseTiming Indicates when the request for the ACK
originated so it can be compared with the
* configured timing for ACK responses.
- *
- * @exception IOException if an input/output error occurs
*/
- public void sendAcknowledgement(ContinueResponseTiming
continueResponseTiming) throws IOException {
+ public void sendAcknowledgement(ContinueResponseTiming
continueResponseTiming) {
if (isCommitted()) {
return;
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 23dc64f723..c9c2ecbed0 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -256,8 +256,6 @@ standardContext.workCreateException=Failed to determine
absolute work directory
standardContext.workCreateFail=Failed to create work directory [{0}] for
context [{1}]
standardContext.workPath=Exception obtaining work path for context [{0}]
-standardContextValve.acknowledgeException=Failed to acknowledge request with a
100 (Continue) response
-
standardEngine.notHost=Child of an Engine must be a Host
standardEngine.notParent=Engine cannot have a parent Container
standardEngine.start=Starting Servlet engine: [{0}]
diff --git a/java/org/apache/catalina/core/StandardContextValve.java
b/java/org/apache/catalina/core/StandardContextValve.java
index a1499dbf96..de36ca3c68 100644
--- a/java/org/apache/catalina/core/StandardContextValve.java
+++ b/java/org/apache/catalina/core/StandardContextValve.java
@@ -18,7 +18,6 @@ package org.apache.catalina.core;
import java.io.IOException;
-import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletResponse;
@@ -28,7 +27,6 @@ import org.apache.catalina.connector.Response;
import org.apache.catalina.valves.ValveBase;
import org.apache.coyote.ContinueResponseTiming;
import org.apache.tomcat.util.buf.MessageBytes;
-import org.apache.tomcat.util.res.StringManager;
/**
* Valve that implements the default basic behavior for the
<code>StandardContext</code> container implementation.
@@ -39,8 +37,6 @@ import org.apache.tomcat.util.res.StringManager;
*/
final class StandardContextValve extends ValveBase {
- private static final StringManager sm =
StringManager.getManager(StandardContextValve.class);
-
StandardContextValve() {
super(true);
}
@@ -75,14 +71,7 @@ final class StandardContextValve extends ValveBase {
}
// Acknowledge the request
- try {
- response.sendAcknowledgement(ContinueResponseTiming.IMMEDIATELY);
- } catch (IOException ioe) {
-
container.getLogger().error(sm.getString("standardContextValve.acknowledgeException"),
ioe);
- request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, ioe);
- response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
- return;
- }
+ response.sendAcknowledgement(ContinueResponseTiming.IMMEDIATELY);
if (request.isAsyncSupported()) {
request.setAsyncSupported(wrapper.getPipeline().isAsyncSupported());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
