Fixed CS. This closes #1120
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4d02c89b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4d02c89b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4d02c89b Branch: refs/heads/master Commit: 4d02c89bf09a737f4fe602a1d34d5604c76370c2 Parents: e700dc2 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Aug 15 10:41:27 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Aug 15 10:41:27 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/component/netty4/NettyProducer.java | 7 +++---- .../apache/camel/component/netty4/NettyTCPChainedTest.java | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4d02c89b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java index 06c7477..42f4db0 100644 --- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java +++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java @@ -240,8 +240,7 @@ public class NettyProducer extends DefaultAsyncProducer { return false; } - public void processWithConnectedChannel(final Exchange exchange, AsyncCallback callback, ChannelFuture channelFuture, - Object body) { + public void processWithConnectedChannel(final Exchange exchange, AsyncCallback callback, ChannelFuture channelFuture, Object body) { // remember channel so we can reuse it final Channel channel = channelFuture.channel(); if (getConfiguration().isReuseChannel() && exchange.getProperty(NettyConstants.NETTY_CHANNEL) == null) { @@ -622,7 +621,7 @@ public class NettyProducer extends DefaultAsyncProducer { private final AsyncCallback callback; private final Object body; - public ChannelConnectedListener(Exchange exchange, AsyncCallback callback, Object body) { + ChannelConnectedListener(Exchange exchange, AsyncCallback callback, Object body) { this.exchange = exchange; this.callback = callback; this.body = body; @@ -637,8 +636,8 @@ public class NettyProducer extends DefaultAsyncProducer { } exchange.setException(cause); callback.done(false); - } + try { processWithConnectedChannel(exchange, callback, future, body); } catch (Throwable e) { http://git-wip-us.apache.org/repos/asf/camel/blob/4d02c89b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java ---------------------------------------------------------------------- diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java index 4c4904b..0c68435 100644 --- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java +++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java @@ -16,6 +16,9 @@ */ package org.apache.camel.component.netty4; +import java.io.FileInputStream; +import java.io.InputStream; + import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.Message; @@ -27,9 +30,6 @@ import org.apache.camel.util.IOHelper; import org.junit.Assert; import org.junit.Test; -import java.io.FileInputStream; -import java.io.InputStream; - /** * In this test we are checking that same netty endpoint can be safely called twice * in single route with reconnect. It requires for processing to be fully async otherwise
