tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1800629 - /tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Date Mon, 03 Jul 2017 11:09:53 GMT
Author: markt
Date: Mon Jul  3 11:09:53 2017
New Revision: 1800629

URL: http://svn.apache.org/viewvc?rev=1800629&view=rev
Log:
Remove unused / unnecessary fields

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=1800629&r1=1800628&r2=1800629&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:09:53
2017
@@ -1002,7 +1002,7 @@ public class DefaultServlet extends Http
                     } else {
                         renderResult = resource.getInputStream();
                     }
-                    copy(resource, renderResult, writer, encoding);
+                    copy(renderResult, writer, encoding);
                 } else {
                     // Output is via an OutputStream
                     if (resource.isDirectory()) {
@@ -1039,14 +1039,14 @@ public class DefaultServlet extends Http
                             }
                             OutputStreamWriter osw = new OutputStreamWriter(ostream, charset);
                             PrintWriter pw = new PrintWriter(osw);
-                            copy(resource, source, pw, fileEncoding);
+                            copy(source, pw, fileEncoding);
                             pw.flush();
                         }
                     }
                     // If a stream was configured, it needs to be copied to
                     // the output (this method closes the stream)
                     if (renderResult != null) {
-                        copy(resource, renderResult, ostream);
+                        copy(renderResult, ostream);
                     }
                 }
             }
@@ -2131,10 +2131,29 @@ public class DefaultServlet extends Http
      * @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
+     *
+     * @exception IOException if an input/output error occurs
+     */
+    protected void copy(InputStream is, ServletOutputStream ostream) throws IOException {
 
         IOException exception = null;
         InputStream istream = new BufferedInputStream(is, input);
@@ -2162,24 +2181,36 @@ public class DefaultServlet extends Http
      * @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);
+    }
 
-        IOException exception = null;
 
-        InputStream resourceInputStream = null;
-        if (resource.isFile()) {
-            resourceInputStream = resource.getInputStream();
-        } else {
-            resourceInputStream = is;
-        }
+    /**
+     * 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 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
+     */
+    protected void copy(InputStream is, PrintWriter writer, String encoding) throws IOException
{
+        IOException exception = null;
 
         Reader reader;
         if (encoding == null) {
-            reader = new InputStreamReader(resourceInputStream);
+            reader = new InputStreamReader(is);
         } else {
-            reader = new InputStreamReader(resourceInputStream, encoding);
+            reader = new InputStreamReader(is, encoding);
         }
 
         // Copy the input stream to the output stream
@@ -2189,8 +2220,9 @@ public class DefaultServlet extends Http
         reader.close();
 
         // Rethrow any exception that has occurred
-        if (exception != null)
+        if (exception != null) {
             throw exception;
+        }
     }
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message