Updated Branches: refs/heads/master 079093ec0 -> 59e99ed4d
CAMEL-6327: More work on new camel-netty-http component. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/59e99ed4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/59e99ed4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/59e99ed4 Branch: refs/heads/master Commit: 59e99ed4de2e8d06cc8fc6019ea23c8231eb03d6 Parents: 079093e Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Jun 19 15:22:38 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Jun 19 15:22:38 2013 +0200 ---------------------------------------------------------------------- .../http/handlers/HttpServerMultiplexChannelHandler.java | 3 +-- .../component/netty/http/NettyHttpSuspendResumeTest.java | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/59e99ed4/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerMultiplexChannelHandler.java ---------------------------------------------------------------------- diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerMultiplexChannelHandler.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerMultiplexChannelHandler.java index fdfdc4b..71d9218 100644 --- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerMultiplexChannelHandler.java +++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerMultiplexChannelHandler.java @@ -145,8 +145,7 @@ public class HttpServerMultiplexChannelHandler extends SimpleChannelUpstreamHand path = path.substring(0, path.length() - 1); } - String safe = UnsafeUriCharactersEncoder.encode(path); - return safe; + return UnsafeUriCharactersEncoder.encode(path); } } http://git-wip-us.apache.org/repos/asf/camel/blob/59e99ed4/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSuspendResumeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSuspendResumeTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSuspendResumeTest.java index 255aff6..5aa86d7 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSuspendResumeTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSuspendResumeTest.java @@ -17,13 +17,11 @@ package org.apache.camel.component.netty.http; import org.apache.camel.builder.RouteBuilder; -import org.junit.Ignore; import org.junit.Test; -@Ignore public class NettyHttpSuspendResumeTest extends BaseNettyTest { - private String serverUri = "netty-http:http://localhost:"; + getPort() + "/cool?chunked=false"; + private String serverUri = "netty-http:http://localhost:"; + getPort() + "/cool"; @Test public void testNettySuspendResume() throws Exception { @@ -33,7 +31,7 @@ public class NettyHttpSuspendResumeTest extends BaseNettyTest { assertEquals("Bye World", reply); // now suspend netty - NettyHttpConsumer consumer = (NettyHttpConsumer) context.getRoute("route1").getConsumer(); + NettyHttpConsumer consumer = (NettyHttpConsumer) context.getRoute("foo").getConsumer(); assertNotNull(consumer); // suspend @@ -62,7 +60,7 @@ public class NettyHttpSuspendResumeTest extends BaseNettyTest { return new RouteBuilder() { @Override public void configure() throws Exception { - from(serverUri) + from(serverUri).routeId("foo") .transform(body().prepend("Bye ")); } };
