Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix issue #1409: regression where we broke streaming payloads

This commit is contained in:
adriancole 2013-03-12 11:35:31 -07:00
parent ac5d571b59
commit 92bfb8224f
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java
View File

@ -208,13 +208,16 @@ public class JavaUrlHttpCommandExecutorService extends BaseHttpCommandExecutorSe
} }
if (chunked) { if (chunked) {
connection.setChunkedStreamingMode(8196); connection.setChunkedStreamingMode(8196);
writePayloadToConnection(payload, "streaming", connection);
} else { } else {
long length = checkNotNull(md.getContentLength(), "payload.getContentLength"); Long length = checkNotNull(md.getContentLength(), "payload.getContentLength");
// http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6755625 // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6755625
checkArgument(length < Integer.MAX_VALUE, checkArgument(length < Integer.MAX_VALUE,
"JDK 1.6 does not support >2GB chunks. Use chunked encoding, if possible."); "JDK 1.6 does not support >2GB chunks. Use chunked encoding, if possible.");
if (length > 0) { if (length > 0) {
writePayloadToConnection(payload, connection); connection.setRequestProperty(CONTENT_LENGTH, length.toString());
connection.setFixedLengthStreamingMode(length.intValue());
writePayloadToConnection(payload, length, connection);
} else { } else {
writeNothing(connection); writeNothing(connection);
} }
@ -231,16 +234,21 @@ public class JavaUrlHttpCommandExecutorService extends BaseHttpCommandExecutorSe
} }
} }
void writePayloadToConnection(Payload payload, HttpURLConnection connection) throws IOException { /**
Long length = payload.getContentMetadata().getContentLength(); * @param payload
connection.setRequestProperty(CONTENT_LENGTH, length.toString()); * payload to write
connection.setFixedLengthStreamingMode(length.intValue()); * @param lengthDesc
* what to use in error log when an IOException occurs
* @param connection
* connection to write to
*/
void writePayloadToConnection(Payload payload, Object lengthDesc, HttpURLConnection connection) throws IOException {
connection.setDoOutput(true); connection.setDoOutput(true);
CountingOutputStream out = new CountingOutputStream(connection.getOutputStream()); CountingOutputStream out = new CountingOutputStream(connection.getOutputStream());
try { try {
payload.writeTo(out); payload.writeTo(out);
} catch (IOException e) { } catch (IOException e) {
logger.error(e, "error after writing %d/%s bytes to %s", out.getCount(), length, connection.getURL()); logger.error(e, "error after writing %d/%s bytes to %s", out.getCount(), lengthDesc, connection.getURL());
throw e; throw e;
} }
} }