You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2014/08/09 09:29:25 UTC
[1/2] git commit: JCLOUDS-652: Require JDK 7
Repository: jclouds
Updated Branches:
refs/heads/master 20bc14528 -> 7e4cacf9e
JCLOUDS-652: Require JDK 7
Moving to Java 7 allows jclouds to use more language and library
features such as try-with-resources and HTTP client improvements.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/5e8bd02c
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/5e8bd02c
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/5e8bd02c
Branch: refs/heads/master
Commit: 5e8bd02c93c7ebacb573342e77ef7ca4b02c4ffb
Parents: 20bc145
Author: Andrew Gaul <ga...@apache.org>
Authored: Thu Apr 17 07:46:44 2014 +0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sat Aug 9 00:28:47 2014 -0700
----------------------------------------------------------------------
project/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/5e8bd02c/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index 0653004..75927a3 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -187,8 +187,8 @@
<properties>
<clojure.version>1.3.0</clojure.version>
- <maven.compile.source>1.6</maven.compile.source>
- <maven.compile.target>1.6</maven.compile.target>
+ <maven.compile.source>1.7</maven.compile.source>
+ <maven.compile.target>1.7</maven.compile.target>
<maven.compile.optimize>true</maven.compile.optimize>
<maven.compile.deprecation>true</maven.compile.deprecation>
<maven.site.url.base>gitsite:git@github.com/jclouds/jclouds-maven-site.git</maven.site.url.base>
[2/2] git commit: JCLOUDS-264: Allow payloads greater than 2 GB
Posted by ga...@apache.org.
JCLOUDS-264: Allow payloads greater than 2 GB
Enabled by JDK 7.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/7e4cacf9
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/7e4cacf9
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/7e4cacf9
Branch: refs/heads/master
Commit: 7e4cacf9ea12d697d6c48b83a28c12d47ab8cfae
Parents: 5e8bd02
Author: Andrew Gaul <ga...@apache.org>
Authored: Thu Apr 17 08:16:47 2014 +0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sat Aug 9 00:28:49 2014 -0700
----------------------------------------------------------------------
.../http/internal/JavaUrlHttpCommandExecutorService.java | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/7e4cacf9/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 7a34c31..76d8fe2 100644
--- a/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java
+++ b/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java
@@ -180,15 +180,10 @@ public class JavaUrlHttpCommandExecutorService extends BaseHttpCommandExecutorSe
connection.setChunkedStreamingMode(8196);
writePayloadToConnection(payload, "streaming", connection);
} else {
- Long length = checkNotNull(md.getContentLength(), "payload.getContentLength");
- // 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");
+ long length = checkNotNull(md.getContentLength(), "payload.getContentLength");
if (length > 0) {
- connection.setRequestProperty(CONTENT_LENGTH, length.toString());
- connection.setFixedLengthStreamingMode(length.intValue());
+ connection.setRequestProperty(CONTENT_LENGTH, String.valueOf(length));
+ connection.setFixedLengthStreamingMode(length);
writePayloadToConnection(payload, length, connection);
} else {
writeNothing(connection);