Updated Branches: refs/heads/1.6.x aee3c10a9 -> f3e43b34f
Support Integer.MAX_VALUE size PUTs Previously jclouds enforced Integer.MAX_VALUE - 1 size. Tested against Atmos Online. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/f3e43b34 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/f3e43b34 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/f3e43b34 Branch: refs/heads/1.6.x Commit: f3e43b34f691a4f885ed3a73677e01033b0f378b Parents: aee3c10 Author: Andrew Gaul <[email protected]> Authored: Wed Aug 28 11:58:02 2013 -0700 Committer: Andrew Gaul <[email protected]> Committed: Wed Aug 28 13:52:34 2013 -0700 ---------------------------------------------------------------------- .../http/internal/JavaUrlHttpCommandExecutorService.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/f3e43b34/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java b/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java index acc2041..fac7c55 100644 --- a/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java +++ b/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java @@ -209,9 +209,11 @@ public class JavaUrlHttpCommandExecutorService extends BaseHttpCommandExecutorSe writePayloadToConnection(payload, "streaming", connection); } else { Long length = checkNotNull(md.getContentLength(), "payload.getContentLength"); - // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6755625 - checkArgument(length < Integer.MAX_VALUE, - "JDK 1.6 does not support >2GB chunks. Use chunked encoding, if possible."); + // TODO: remove check after moving to JDK 7. + checkArgument(length <= Integer.MAX_VALUE, + "Cannot transfer 2 GB or larger chunks due to JDK 1.6 limitations." + + " Use chunked encoding or multi-part upload, if possible." + + " For more information: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6755625";); if (length > 0) { connection.setRequestProperty(CONTENT_LENGTH, length.toString()); connection.setFixedLengthStreamingMode(length.intValue());
