You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/01/12 07:14:24 UTC
[1/2] camel git commit: CAMEL-10577 replace BufferingResponseListener
with InputStreamResponseListener to avoid hardcoded 2MB limit
Repository: camel
Updated Branches:
refs/heads/camel-2.18.x a64c9c7a0 -> 83e8e1fc7
CAMEL-10577 replace BufferingResponseListener with InputStreamResponseListener to avoid hardcoded 2MB limit
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/02bb487d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/02bb487d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/02bb487d
Branch: refs/heads/camel-2.18.x
Commit: 02bb487d32764f8d09f7212d0c61038a49ee9ed8
Parents: a64c9c7
Author: Kevin Earls <ke...@kevinearls.com>
Authored: Tue Jan 10 09:56:40 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Jan 12 08:02:15 2017 +0100
----------------------------------------------------------------------
.../component/jetty9/JettyContentExchange9.java | 26 +++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/02bb487d/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 f7cba4a..0730053 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
@@ -16,12 +16,14 @@
*/
package org.apache.camel.component.jetty9;
+import java.io.ByteArrayOutputStream;
import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
+import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.Map;
import java.util.TreeMap;
@@ -29,6 +31,8 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
+
import org.apache.camel.AsyncCallback;
import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
@@ -39,14 +43,16 @@ import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.Request;
import org.eclipse.jetty.client.api.Response;
import org.eclipse.jetty.client.api.Result;
-import org.eclipse.jetty.client.util.BufferingResponseListener;
import org.eclipse.jetty.client.util.BytesContentProvider;
import org.eclipse.jetty.client.util.InputStreamContentProvider;
+import org.eclipse.jetty.client.util.InputStreamResponseListener;
import org.eclipse.jetty.client.util.StringContentProvider;
import org.eclipse.jetty.http.HttpFields;
+import org.eclipse.jetty.util.Callback;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
/**
* Jetty specific exchange which keeps track of the the request and response.
*/
@@ -214,14 +220,28 @@ public class JettyContentExchange9 implements JettyContentExchange {
}
};
- BufferingResponseListener responseListener = new BufferingResponseListener() {
+
+ InputStreamResponseListener responseListener = new InputStreamResponseListener() {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ @Override
+ public void onContent(Response response, ByteBuffer content, Callback callback) {
+ if (response.getStatus() != SC_OK) {
+ LOG.warn("Response received {}: {}", response.getStatus(), response.getReason());
+ }
+ byte[] buffer = new byte[content.limit()];
+ content.get(buffer);
+ baos.write(buffer, 0, buffer.length);
+
+ callback.succeeded();
+ }
@Override
public void onComplete(Result result) {
if (result.isFailed()) {
doTaskCompleted(result.getFailure());
} else {
- onResponseComplete(result, getContent(), getMediaType());
+ onResponseComplete(result, baos.toByteArray(), null);
}
}
};
[2/2] camel git commit: CAMEL-10577 replace BufferingResponseLisener
with InputStreamResponseListener to avoid hardcoded 2MB limit
Posted by ac...@apache.org.
CAMEL-10577 replace BufferingResponseLisener with InputStreamResponseListener to avoid hardcoded 2MB limit
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/83e8e1fc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/83e8e1fc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/83e8e1fc
Branch: refs/heads/camel-2.18.x
Commit: 83e8e1fc7a6164b1e05f0ad946631b3c2d25c8ce
Parents: 02bb487
Author: Kevin Earls <ke...@kevinearls.com>
Authored: Wed Jan 11 17:08:11 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Jan 12 08:02:25 2017 +0100
----------------------------------------------------------------------
.../apache/camel/component/jetty9/JettyContentExchange9.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/83e8e1fc/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 0730053..50f2e43 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
@@ -86,7 +86,7 @@ public class JettyContentExchange9 implements JettyContentExchange {
closeRequestContentSource();
}
- protected void onResponseComplete(Result result, byte[] content, String contentType) {
+ protected void onResponseComplete(Result result, byte[] content) {
LOG.trace("onResponseComplete");
done.countDown();
this.response = result.getResponse();
@@ -226,9 +226,6 @@ public class JettyContentExchange9 implements JettyContentExchange {
@Override
public void onContent(Response response, ByteBuffer content, Callback callback) {
- if (response.getStatus() != SC_OK) {
- LOG.warn("Response received {}: {}", response.getStatus(), response.getReason());
- }
byte[] buffer = new byte[content.limit()];
content.get(buffer);
baos.write(buffer, 0, buffer.length);
@@ -241,7 +238,7 @@ public class JettyContentExchange9 implements JettyContentExchange {
if (result.isFailed()) {
doTaskCompleted(result.getFailure());
} else {
- onResponseComplete(result, baos.toByteArray(), null);
+ onResponseComplete(result, baos.toByteArray());
}
}
};