This is an automated email from the ASF dual-hosted git repository.
markt-asf 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 590b77bfa1 Remove deprecated code
590b77bfa1 is described below
commit 590b77bfa1d94c9e1fc604bafff03ea3cbdefcbb
Author: Mark Thomas <[email protected]>
AuthorDate: Wed May 27 10:37:50 2026 +0100
Remove deprecated code
---
.../apache/catalina/servlets/DefaultServlet.java | 52 ----------------------
1 file changed, 52 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index a28f6ab51c..5d8066cafc 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2660,22 +2660,6 @@ public class DefaultServlet extends HttpServlet {
}
- /**
- * Copy the contents of the specified input stream to the specified output
stream and return, rather than throw, any
- * IOException that occurs.
- *
- * @param istream The input stream to read from
- * @param ostream The output stream to write to
- *
- * @return Exception which occurred during processing
- *
- * @deprecated Will be removed in Tomcat 12. Use {@link
#copyNoThrow(InputStream, ServletOutputStream)}
- */
- @Deprecated
- protected IOException copyRange(InputStream istream, ServletOutputStream
ostream) {
- return copyNoThrow(istream, ostream);
- }
-
/**
* Copy the contents of the specified input stream to the specified output
stream and return, rather than throw, any
* IOException that occurs.
@@ -2707,23 +2691,6 @@ public class DefaultServlet extends HttpServlet {
}
- /**
- * Copy the contents of the specified reader to the specified writer and
return, rather than throw, any IOException
- * that occurs.
- *
- * @param reader The reader to read from
- * @param writer The writer to write to
- *
- * @return Exception which occurred during processing
- *
- * @deprecated Will be removed in Tomcat 12. Use {@link
#copyNoThrow(Reader, PrintWriter)}
- */
- @Deprecated
- protected IOException copyRange(Reader reader, PrintWriter writer) {
- return copyNoThrow(reader, writer);
- }
-
-
/**
* Copy the contents of the specified reader to the specified writer and
return, rather than throw, any IOException
* that occurs.
@@ -2754,25 +2721,6 @@ public class DefaultServlet extends HttpServlet {
}
- /**
- * Copy the selected contents of the specified input stream to the
specified output stream, and return, rather than
- * throw, any IOException that occurs.
- *
- * @param istream The input stream to read from
- * @param ostream The output stream to write to
- * @param start Start of the range which will be copied
- * @param end End of the range which will be copied
- *
- * @return Exception which occurred during processing
- *
- * @deprecated Will be removed in Tomcat 12. Use {@link
#copyNoThrow(InputStream, ServletOutputStream, long, long)}
- */
- @Deprecated
- protected IOException copyRange(InputStream istream, ServletOutputStream
ostream, long start, long end) {
- return copyNoThrow(istream, ostream, start, end);
- }
-
-
/**
* Copy the selected contents of the specified input stream to the
specified output stream, and return, rather than
* throw, any IOException that occurs.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
