Author: markt
Date: Thu Nov 15 20:43:32 2018
New Revision: 1846679
URL: http://svn.apache.org/viewvc?rev=1846679&view=rev
Log:
Refactor to use IOTools to copy from InputStream to OutputStream
Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1846679&r1=1846678&r2=1846679&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Thu Nov
15 20:43:32 2018
@@ -16,10 +16,10 @@
*/
package org.apache.catalina.ant;
-import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.OutputStream;
import java.net.Authenticator;
import java.net.HttpURLConnection;
import java.net.PasswordAuthentication;
@@ -210,17 +210,8 @@ public abstract class AbstractCatalinaTa
// Send the request data (if any)
if (istream != null) {
- try (BufferedOutputStream ostream = new BufferedOutputStream(
- hconn.getOutputStream(), 1024)) {
- byte buffer[] = new byte[1024];
- while (true) {
- int n = istream.read(buffer);
- if (n < 0) {
- break;
- }
- ostream.write(buffer, 0, n);
- }
- ostream.flush();
+ try (OutputStream ostream = hconn.getOutputStream()) {
+ IOTools.flow(istream, ostream);
} finally {
try {
istream.close();
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1846679&r1=1846678&r2=1846679&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Thu Nov
15 20:43:32 2018
@@ -16,11 +16,11 @@
*/
package org.apache.catalina.manager;
-import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStream;
import java.io.PrintWriter;
import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
@@ -61,6 +61,7 @@ import org.apache.catalina.connector.Con
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.startup.ExpandWar;
import org.apache.catalina.util.ContextName;
+import org.apache.catalina.util.IOTools;
import org.apache.catalina.util.ServerInfo;
import org.apache.coyote.ProtocolHandler;
import org.apache.coyote.http11.AbstractHttp11Protocol;
@@ -1665,16 +1666,8 @@ public class ManagerServlet extends Http
}
try (ServletInputStream istream = request.getInputStream();
- BufferedOutputStream ostream =
- new BufferedOutputStream(new FileOutputStream(war),
1024)) {
- byte buffer[] = new byte[1024];
- while (true) {
- int n = istream.read(buffer);
- if (n < 0) {
- break;
- }
- ostream.write(buffer, 0, n);
- }
+ OutputStream ostream = new FileOutputStream(war)) {
+ IOTools.flow(istream, ostream);
} catch (IOException e) {
if (war.exists() && !war.delete()) {
writer.println(
@@ -1682,7 +1675,6 @@ public class ManagerServlet extends Http
}
throw e;
}
-
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1846679&r1=1846678&r2=1846679&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Thu Nov 15
20:43:32 2018
@@ -16,12 +16,12 @@
*/
package org.apache.catalina.startup;
-import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.file.Files;
@@ -64,6 +64,7 @@ import org.apache.catalina.core.Standard
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.security.DeployXmlPermission;
import org.apache.catalina.util.ContextName;
+import org.apache.catalina.util.IOTools;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -930,17 +931,8 @@ public class HostConfig implements Lifec
try (JarFile jar = new JarFile(war)) {
JarEntry entry =
jar.getJarEntry(Constants.ApplicationContextXml);
try (InputStream istream = jar.getInputStream(entry);
- FileOutputStream fos = new FileOutputStream(xml);
- BufferedOutputStream ostream = new
BufferedOutputStream(fos, 1024)) {
- byte buffer[] = new byte[1024];
- while (true) {
- int n = istream.read(buffer);
- if (n < 0) {
- break;
- }
- ostream.write(buffer, 0, n);
- }
- ostream.flush();
+ OutputStream ostream = new FileOutputStream(xml)) {
+ IOTools.flow(istream, ostream);
}
} catch (IOException e) {
/* Ignore */
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
