Fixed CS. This closes #941
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8f16f02b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8f16f02b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8f16f02b Branch: refs/heads/camel-2.17.x Commit: 8f16f02b73a0f9e8742aa34e8e3731d66f9c2c39 Parents: eb2ea7b Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Apr 13 11:31:10 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Apr 13 11:35:35 2016 +0200 ---------------------------------------------------------------------- .../netty4/SingleTCPNettyServerBootstrapFactory.java | 8 ++++---- .../netty4/SingleUDPNettyServerBootstrapFactory.java | 8 ++++---- .../NettyUDPMessageLargerThanDefaultBufferSizeTest.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8f16f02b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java ---------------------------------------------------------------------- diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java index fb764fe..0fe4e82 100644 --- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java +++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java @@ -169,13 +169,13 @@ public class SingleTCPNettyServerBootstrapFactory extends ServiceSupport impleme Map<String, Object> options = configuration.getOptions(); if (options != null) { for (Map.Entry<String, Object> entry : options.entrySet()) { - Object value = entry.getValue(); + String value = entry.getValue().toString(); ChannelOption<Object> option = ChannelOption.valueOf(entry.getKey()); //For all netty options that aren't of type String //TODO: find a way to add primitive Netty options without having to add them to the Camel registry. - if (EndpointHelper.isReferenceParameter(value.toString())) { - String name = ((String)value).substring(1); - Object o = CamelContextHelper.mandatoryLookup(camelContext, name);; + if (EndpointHelper.isReferenceParameter(value)) { + String name = value.substring(1); + Object o = CamelContextHelper.mandatoryLookup(camelContext, name); serverBootstrap.option(option, o); } else { serverBootstrap.option(ChannelOption.valueOf(entry.getKey()), value); http://git-wip-us.apache.org/repos/asf/camel/blob/8f16f02b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java ---------------------------------------------------------------------- diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java index 4f862f2..ca0482f 100644 --- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java +++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java @@ -149,13 +149,13 @@ public class SingleUDPNettyServerBootstrapFactory extends ServiceSupport impleme Map<String, Object> options = configuration.getOptions(); if (options != null) { for (Map.Entry<String, Object> entry : options.entrySet()) { - Object value = entry.getValue(); + String value = entry.getValue().toString(); ChannelOption<Object> option = ChannelOption.valueOf(entry.getKey()); //For all netty options that aren't of type String //TODO: find a way to add primitive Netty options without having to add them to the Camel registry. - if (EndpointHelper.isReferenceParameter(value.toString())) { - String name = ((String)value).substring(1); - Object o = CamelContextHelper.mandatoryLookup(camelContext, name);; + if (EndpointHelper.isReferenceParameter(value)) { + String name = value.substring(1); + Object o = CamelContextHelper.mandatoryLookup(camelContext, name); bootstrap.option(option, o); } else { bootstrap.option(ChannelOption.valueOf(entry.getKey()), value); http://git-wip-us.apache.org/repos/asf/camel/blob/8f16f02b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java index 77a681b..b3e28e3 100644 --- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java +++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java @@ -62,7 +62,7 @@ public class NettyUDPMessageLargerThanDefaultBufferSizeTest extends BaseNettyTes return new RouteBuilder() { @Override public void configure() throws Exception { - from("netty4:udp://localhost:{{port}}?option."+ ChannelOption.RCVBUF_ALLOCATOR.name() +"=#"+ChannelOption.RCVBUF_ALLOCATOR.name()) + from("netty4:udp://localhost:{{port}}?option." + ChannelOption.RCVBUF_ALLOCATOR.name() + "=#" + ChannelOption.RCVBUF_ALLOCATOR.name()) .to("mock:result"); } };
