Author: violetagg
Date: Thu Jul 30 17:20:16 2015
New Revision: 1693461
URL: http://svn.apache.org/r1693461
Log:
Allow files bigger than 2G to be deployed using ant tasks.
Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java
tomcat/trunk/test/org/apache/catalina/ant/TestDeployTask.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=1693461&r1=1693460&r2=1693461&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Thu Jul
30 17:20:16 2015
@@ -185,7 +185,7 @@ public abstract class AbstractCatalinaTa
* @exception BuildException if an error occurs
*/
public void execute(String command, InputStream istream,
- String contentType, int contentLength)
+ String contentType, long contentLength)
throws BuildException {
URLConnection conn = null;
Modified: tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java?rev=1693461&r1=1693460&r2=1693461&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java Thu Jul 30
17:20:16 2015
@@ -140,13 +140,13 @@ public class DeployTask extends Abstract
// Building an input stream on the WAR to upload, if any
BufferedInputStream stream = null;
String contentType = null;
- int contentLength = -1;
+ long contentLength = -1;
if (war != null) {
if (PROTOCOL_PATTERN.matcher(war).lookingAt()) {
try {
URL url = new URL(war);
URLConnection conn = url.openConnection();
- contentLength = conn.getContentLength();
+ contentLength = conn.getContentLengthLong();
stream = new BufferedInputStream
(conn.getInputStream(), 1024);
} catch (IOException e) {
@@ -156,16 +156,8 @@ public class DeployTask extends Abstract
FileInputStream fsInput = null;
try {
fsInput = new FileInputStream(war);
- long size = fsInput.getChannel().size();
-
- if (size > Integer.MAX_VALUE)
- throw new UnsupportedOperationException(
- "DeployTask does not support WAR files " +
- "greater than 2 Gb");
- contentLength = (int) size;
-
+ contentLength = fsInput.getChannel().size();
stream = new BufferedInputStream(fsInput, 1024);
-
} catch (IOException e) {
if (fsInput != null) {
try {
Modified: tomcat/trunk/test/org/apache/catalina/ant/TestDeployTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/ant/TestDeployTask.java?rev=1693461&r1=1693460&r2=1693461&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/ant/TestDeployTask.java (original)
+++ tomcat/trunk/test/org/apache/catalina/ant/TestDeployTask.java Thu Jul 30
17:20:16 2015
@@ -35,7 +35,7 @@ public class TestDeployTask extends Tomc
DeployTask deployTask = new DeployTask() {
@Override
- public void execute(String command, InputStream istream, String
contentType, int contentLength)
+ public void execute(String command, InputStream istream, String
contentType, long contentLength)
throws BuildException {
assertEquals("/deploy?path=somepath", command);
assertEquals("application/octet-stream", contentType);
@@ -87,7 +87,7 @@ public class TestDeployTask extends Tomc
DeployTask deployTask = new DeployTask() {
@Override
- public void execute(String command, InputStream istream, String
contentType, int contentLength)
+ public void execute(String command, InputStream istream, String
contentType, long contentLength)
throws BuildException {
assertEquals("/deploy?path=somepath", command);
assertEquals("application/octet-stream", contentType);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
