This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 27166f8 Remove deprecated code
27166f8 is described below
commit 27166f8d43476840d51733244b7544de7d5ee43e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sat Sep 5 17:02:12 2020 +0100
Remove deprecated code
---
java/org/apache/catalina/connector/Response.java | 14 --------------
java/org/apache/coyote/AbstractProcessor.java | 10 ----------
java/org/apache/coyote/http11/Http11Processor.java | 6 ------
3 files changed, 30 deletions(-)
diff --git a/java/org/apache/catalina/connector/Response.java
b/java/org/apache/catalina/connector/Response.java
index 5e277fa..c529d97 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -1193,20 +1193,6 @@ public class Response implements HttpServletResponse {
/**
* Send an acknowledgement of a request.
*
- * @exception IOException if an input/output error occurs
- *
- * @deprecated Unused. Will be removed in Tomcat 10.
- * Use {@link #sendAcknowledgement(ContinueResponseTiming)}.
- */
- @Deprecated
- public void sendAcknowledgement() throws IOException {
- sendAcknowledgement(ContinueResponseTiming.ALWAYS);
- }
-
-
- /**
- * Send an acknowledgement of a request.
- *
* @param continueResponseTiming Indicates when the request for the ACK
* originated so it can be compared with the
* configured timing for ACK responses.
diff --git a/java/org/apache/coyote/AbstractProcessor.java
b/java/org/apache/coyote/AbstractProcessor.java
index f3b87ac..38e7f74 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -722,16 +722,6 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
protected abstract void finishResponse() throws IOException;
- /**
- * @deprecated Unused. This will be removed in Tomcat 10 onwards. Use
- * @{link {@link #ack(ContinueResponseTiming)}.
- */
- @Deprecated
- protected void ack() {
- ack(ContinueResponseTiming.ALWAYS);
- }
-
-
protected abstract void ack(ContinueResponseTiming continueResponseTiming);
diff --git a/java/org/apache/coyote/http11/Http11Processor.java
b/java/org/apache/coyote/http11/Http11Processor.java
index 37bb97b..a169cb4 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -1160,12 +1160,6 @@ public class Http11Processor extends AbstractProcessor {
@Override
- protected final void ack() {
- ack(null);
- }
-
-
- @Override
protected final void ack(ContinueResponseTiming continueResponseTiming) {
// Only try and send the ACK for ALWAYS or if the timing of the request
// to send the ACK matches the current configuration.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
