Author: markt Date: Mon Jul 3 11:10:39 2017 New Revision: 1800630 URL: http://svn.apache.org/viewvc?rev=1800630&view=rev Log: Remove deprecated code
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1800630&r1=1800629&r2=1800630&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Mon Jul 3 11:10:39 2017 @@ -2126,28 +2126,6 @@ public class DefaultServlet extends Http * output stream, and ensure that both streams are closed before returning * (even in the face of an exception). * - * @param resource The source resource - * @param is The input stream to read the source resource from - * @param ostream The output stream to write to - * - * @exception IOException if an input/output error occurs - * - * @Deprecated Unused. This will be removed in Tomcat 9. - * Use {@link #copy(InputStream, ServletOutputStream)} - */ - @Deprecated - protected void copy(WebResource resource, InputStream is, - ServletOutputStream ostream) - throws IOException { - copy(is, ostream); - } - - - /** - * Copy the contents of the specified input stream to the specified - * output stream, and ensure that both streams are closed before returning - * (even in the face of an exception). - * * @param is The input stream to read the source resource from * @param ostream The output stream to write to * @@ -2170,28 +2148,6 @@ public class DefaultServlet extends Http } - /** - * Copy the contents of the specified input stream to the specified - * output stream, and ensure that both streams are closed before returning - * (even in the face of an exception). - * - * @param resource The source resource - * @param is The input stream to read the source resource from - * @param writer The writer to write to - * @param encoding The encoding to use when reading the source input stream - * - * @exception IOException if an input/output error occurs - * - * @Deprecated Unused. This will be removed in Tomcat 9. - * Use {@link #copy(InputStream, PrintWriter, String)} - */ - @Deprecated - protected void copy(WebResource resource, InputStream is, PrintWriter writer, - String encoding) throws IOException { - copy(is, writer,encoding); - } - - /** * Copy the contents of the specified input stream to the specified * output stream, and ensure that both streams are closed before returning --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org