Revert "CAMEL-11048 Jetty Producer always uses "Transfer-Encoding: chunked" header"
This reverts commit 99e506e312aac6a235ea9fc7f7120f9832ec9a6e. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/38a6966a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/38a6966a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/38a6966a Branch: refs/heads/camel-2.17.x Commit: 38a6966ad8ab89a223c71f2f0539bb3a68e34b6e Parents: 91483f7 Author: Andrea Cosentino <anco...@gmail.com> Authored: Thu Mar 23 10:47:31 2017 +0100 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Thu Mar 23 10:47:31 2017 +0100 ---------------------------------------------------------------------- .../component/jetty/JettyContentExchange.java | 2 -- .../component/jetty/JettyHttpProducer.java | 9 ++------- .../jetty9/CamelInputStreamContentProvider.java | 21 -------------------- .../component/jetty9/JettyContentExchange9.java | 5 ----- 4 files changed, 2 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/38a6966a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java index 809168c..af63606 100644 --- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java +++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java @@ -44,8 +44,6 @@ public interface JettyContentExchange { void setRequestContent(String data, String charset) throws UnsupportedEncodingException; void setRequestContent(InputStream ins); - - void setRequestContent(InputStream ins, int contentLength); void addRequestHeader(String key, String s); http://git-wip-us.apache.org/repos/asf/camel/blob/38a6966a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java index ee6b83b..2a01b39 100644 --- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java +++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java @@ -164,18 +164,13 @@ public class JettyHttpProducer extends DefaultAsyncProducer implements AsyncProc String charset = IOHelper.getCharsetName(exchange, false); httpExchange.setRequestContent(data, charset); } else { - // then fallback to input stream + // then fallback to input stream InputStream is = exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, exchange, exchange.getIn().getBody()); + httpExchange.setRequestContent(is); // setup the content length if it is possible String length = exchange.getIn().getHeader(Exchange.CONTENT_LENGTH, String.class); if (ObjectHelper.isNotEmpty(length)) { httpExchange.addRequestHeader(Exchange.CONTENT_LENGTH, length); - //send with content-length - httpExchange.setRequestContent(is, new Integer(length)); - - } else { - //send chunked - httpExchange.setRequestContent(is); } } } http://git-wip-us.apache.org/repos/asf/camel/blob/38a6966a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java deleted file mode 100644 index 08d66c6..0000000 --- a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apache.camel.component.jetty9; - -import java.io.InputStream; - -import org.eclipse.jetty.client.util.InputStreamContentProvider; - -public class CamelInputStreamContentProvider extends InputStreamContentProvider { - - private int length; - - public CamelInputStreamContentProvider(InputStream stream, int length) { - super(stream); - this.length = length; - } - - @Override - public long getLength() - { - return length; - } -} http://git-wip-us.apache.org/repos/asf/camel/blob/38a6966a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java index d1eaab0..f9966cc 100644 --- a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java +++ b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java @@ -195,11 +195,6 @@ public class JettyContentExchange9 implements JettyContentExchange { this.request.content(new InputStreamContentProvider(ins), this.requestContentType); } - public void setRequestContent(InputStream ins, int contentLength) { - this.request.content(new CamelInputStreamContentProvider(ins, contentLength), this.requestContentType); - - } - public void addRequestHeader(String key, String s) { this.request.header(key, s); }
