You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/05/04 12:08:17 UTC
[8/8] camel git commit: CAMEL-9040: Fixed netty leak in some tests
CAMEL-9040: Fixed netty leak in some tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/74a7020f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/74a7020f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/74a7020f
Branch: refs/heads/master
Commit: 74a7020fa36b33ad2e13f67e21af2a7df7a22cd7
Parents: 16c5e34
Author: Claus Ibsen <da...@apache.org>
Authored: Wed May 4 11:45:50 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed May 4 14:07:56 2016 +0200
----------------------------------------------------------------------
.../netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java | 1 +
.../netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java | 2 ++
.../component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java | 2 ++
.../apache/camel/component/netty4/http/NettyHttpHandle404Test.java | 2 ++
.../camel/component/netty4/http/NettyHttpOkStatusCodeTest.java | 1 +
.../camel/component/netty4/http/NettyHttpReturnFaultTest.java | 1 +
6 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/74a7020f/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java
index b5aa37b..13c7f68 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java
@@ -36,6 +36,7 @@ public class NettyHttp500ErrorThrowExceptionOnServerTest extends BaseNettyTest {
assertNotNull(trace);
assertTrue(trace.startsWith("java.lang.IllegalArgumentException: Camel cannot do this"));
assertEquals("http://localhost:" + getPort() + "/foo", cause.getUri());
+ cause.getHttpContent().content().release();
}
assertMockEndpointsSatisfied();
http://git-wip-us.apache.org/repos/asf/camel/blob/74a7020f/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java
index 6e32b85..54895c2 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java
@@ -63,6 +63,8 @@ public class NettyHttpAccessHttpRequestAndResponseBeanTest extends BaseNettyTest
String in = request.content().toString(Charset.forName("UTF-8"));
String reply = "Bye " + in;
+ request.content().release();
+
HttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK,
NettyConverter.toByteBuffer(reply.getBytes()));
http://git-wip-us.apache.org/repos/asf/camel/blob/74a7020f/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java
index b1d4dbc..0c37615 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java
@@ -48,6 +48,8 @@ public class NettyHttpAccessHttpRequestBeanTest extends BaseNettyTest {
public static String myTransformer(FullHttpRequest request) {
String in = request.content().toString(Charset.forName("UTF-8"));
+ // release as no longer in use
+ request.content().release();
return "Bye " + in;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/74a7020f/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHandle404Test.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHandle404Test.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHandle404Test.java
index 385ecef..f19690f 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHandle404Test.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHandle404Test.java
@@ -72,6 +72,8 @@ public class NettyHttpHandle404Test extends BaseNettyTest {
NettyHttpOperationFailedException cause = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, NettyHttpOperationFailedException.class);
exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, cause.getStatusCode());
exchange.getOut().setBody(cause.getHttpContent().content().toString(Charset.defaultCharset()));
+ // release as no longer in use
+ cause.getHttpContent().content().release();
}
})
.end();
http://git-wip-us.apache.org/repos/asf/camel/blob/74a7020f/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOkStatusCodeTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOkStatusCodeTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOkStatusCodeTest.java
index c48c1f7..0a0fa36 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOkStatusCodeTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOkStatusCodeTest.java
@@ -34,6 +34,7 @@ public class NettyHttpOkStatusCodeTest extends BaseNettyTest {
assertEquals(209, cause.getStatusCode());
String body = context.getTypeConverter().convertTo(String.class, cause.getHttpContent().content());
assertEquals("Not allowed", body);
+ cause.getHttpContent().content().release();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/74a7020f/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpReturnFaultTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpReturnFaultTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpReturnFaultTest.java
index f230710..9b8def5 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpReturnFaultTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpReturnFaultTest.java
@@ -38,6 +38,7 @@ public class NettyHttpReturnFaultTest extends BaseNettyTest {
assertEquals(500, exception.getStatusCode());
String message = context.getTypeConverter().convertTo(String.class, exception.getHttpContent().content());
assertEquals("This is a fault", message);
+ exception.getHttpContent().content().release();
}
@Override