Repository: camel Updated Branches: refs/heads/master 09c2e2e47 -> 2ecd1ba33
CAMEL-8391 Try to fix the camel-mina/camel-mina2 test error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ecd1ba3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ecd1ba3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ecd1ba3 Branch: refs/heads/master Commit: 2ecd1ba33eb62c39badf09e096cdd6a6c6d9cdb3 Parents: 09c2e2e Author: Willem Jiang <willem.ji...@gmail.com> Authored: Fri Mar 6 11:15:07 2015 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Fri Mar 6 11:15:07 2015 +0800 ---------------------------------------------------------------------- .../component/mina/MinaClientModeTcpTextlineDelimiterTest.java | 4 ++-- .../mina2/Mina2ClientModeTcpTextlineDelimiterTest.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2ecd1ba3/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientModeTcpTextlineDelimiterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientModeTcpTextlineDelimiterTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientModeTcpTextlineDelimiterTest.java index 7ed6436..c7fdc1a 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientModeTcpTextlineDelimiterTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientModeTcpTextlineDelimiterTest.java @@ -49,7 +49,7 @@ public class MinaClientModeTcpTextlineDelimiterTest extends BaseMinaTest { return new RouteBuilder() { public void configure() { - from(String.format("mina:tcp://localhost:%1$s?sync=false&textline=true&textlineDelimiter=UNIX&clientMode=true", getPort())) + from(String.format("mina:tcp://127.0.0.1:%1$s?sync=false&textline=true&textlineDelimiter=UNIX&clientMode=true", getPort())) .id("minaRoute") .noAutoStartup() .to("log:before?showAll=true") @@ -70,7 +70,7 @@ public class MinaClientModeTcpTextlineDelimiterTest extends BaseMinaTest { acceptor = new SocketAcceptor(); TextLineCodecFactory codecFactory = new TextLineCodecFactory(Charset.forName("UTF-8"), LineDelimiter.UNIX); acceptor.getFilterChain().addLast("codec", new ProtocolCodecFilter(codecFactory)); - acceptor.bind(new InetSocketAddress(port), new ServerHandler()); + acceptor.bind(new InetSocketAddress("127.0.0.1,", port), new ServerHandler()); } public void shutdown() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/2ecd1ba3/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java index cf5cfda..7e2c446 100644 --- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java +++ b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java @@ -23,7 +23,6 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.mina.core.service.IoAcceptor; import org.apache.mina.core.service.IoHandlerAdapter; -import org.apache.mina.core.session.IdleStatus; import org.apache.mina.core.session.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFilter; import org.apache.mina.filter.codec.textline.LineDelimiter; @@ -50,7 +49,7 @@ public class Mina2ClientModeTcpTextlineDelimiterTest extends BaseMina2Test { return new RouteBuilder() { public void configure() { - from(String.format("mina2:tcp://localhost:%1$s?sync=false&textline=true&textlineDelimiter=UNIX&clientMode=true", getPort())) + from(String.format("mina2:tcp://127.0.0.1:%1$s?sync=false&textline=true&textlineDelimiter=UNIX&clientMode=true", getPort())) .id("minaRoute") .noAutoStartup() .to("log:before?showAll=true") @@ -72,7 +71,7 @@ public class Mina2ClientModeTcpTextlineDelimiterTest extends BaseMina2Test { Mina2TextLineCodecFactory codecFactory = new Mina2TextLineCodecFactory(Charset.forName("UTF-8"), LineDelimiter.UNIX); acceptor.getFilterChain().addLast("codec", new ProtocolCodecFilter(codecFactory)); acceptor.setHandler(new ServerHandler()); - acceptor.bind(new InetSocketAddress(port)); + acceptor.bind(new InetSocketAddress("127.0.0.1", port)); } public void shutdown() throws Exception {
