From f106caef5efe0f0c5532fae83429757ff60e958e Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Fri, 12 Jun 2015 14:18:56 -0500 Subject: [PATCH 1/2] use HttpEntity.isRepeatable if appropriate --- .../java/com/google/api/client/http/apache/ContentEntity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/google-http-client/src/main/java/com/google/api/client/http/apache/ContentEntity.java b/google-http-client/src/main/java/com/google/api/client/http/apache/ContentEntity.java index 65a6c1c96..508cfdc3e 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/apache/ContentEntity.java +++ b/google-http-client/src/main/java/com/google/api/client/http/apache/ContentEntity.java @@ -17,6 +17,7 @@ import com.google.api.client.util.Preconditions; import com.google.api.client.util.StreamingContent; +import org.apache.http.HttpEntity; import org.apache.http.entity.AbstractHttpEntity; import java.io.IOException; @@ -52,7 +53,7 @@ public long getContentLength() { } public boolean isRepeatable() { - return false; + return streamingContent instanceof HttpEntity && ((HttpEntity)streamingContent).isRepeatable(); } public boolean isStreaming() { From ac5d0641b19b6c49e964428430f514509b9d473f Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Mon, 15 Jun 2015 09:58:00 -0500 Subject: [PATCH 2/2] changed HttpEntity to HttpContent --- .../com/google/api/client/http/apache/ContentEntity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/google-http-client/src/main/java/com/google/api/client/http/apache/ContentEntity.java b/google-http-client/src/main/java/com/google/api/client/http/apache/ContentEntity.java index 508cfdc3e..a86776a5a 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/apache/ContentEntity.java +++ b/google-http-client/src/main/java/com/google/api/client/http/apache/ContentEntity.java @@ -14,10 +14,10 @@ package com.google.api.client.http.apache; +import com.google.api.client.http.HttpContent; import com.google.api.client.util.Preconditions; import com.google.api.client.util.StreamingContent; -import org.apache.http.HttpEntity; import org.apache.http.entity.AbstractHttpEntity; import java.io.IOException; @@ -53,7 +53,7 @@ public long getContentLength() { } public boolean isRepeatable() { - return streamingContent instanceof HttpEntity && ((HttpEntity)streamingContent).isRepeatable(); + return streamingContent instanceof HttpContent && ((HttpContent)streamingContent).retrySupported(); } public boolean isStreaming() { @@ -65,4 +65,4 @@ public void writeTo(OutputStream out) throws IOException { streamingContent.writeTo(out); } } -} +} \ No newline at end of file