Repository: camel Updated Branches: refs/heads/camel-2.14.x fba8c49ad -> 9d7440cf9
CAMEL-8031 Fixed the issue of maximumPoolSize option is ignored Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9d7440cf Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9d7440cf Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9d7440cf Branch: refs/heads/camel-2.14.x Commit: 9d7440cf953e6258a81db2a2d2b2cd0a0c6a8a88 Parents: fba8c49 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Fri Nov 14 17:28:33 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Fri Nov 14 19:43:50 2014 +0800 ---------------------------------------------------------------------- .../org/apache/camel/component/netty/NettyComponent.java | 11 ++++++++++- .../apache/camel/component/netty/NettyConfiguration.java | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9d7440cf/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyComponent.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyComponent.java index 810ea8d..3954e2e 100644 --- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyComponent.java +++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyComponent.java @@ -35,6 +35,7 @@ public class NettyComponent extends UriEndpointComponent { // use a shared timer for Netty (see javadoc for HashedWheelTimer) private static volatile Timer timer; private NettyConfiguration configuration; + private int maximumPoolSize = 16; private OrderedMemoryAwareThreadPoolExecutor executorService; public NettyComponent() { @@ -95,6 +96,14 @@ public class NettyComponent extends UriEndpointComponent { this.configuration = configuration; } + public int getMaximumPoolSize() { + return maximumPoolSize; + } + + public void setMaximumPoolSize(int maximumPoolSize) { + this.maximumPoolSize = maximumPoolSize; + } + public static Timer getTimer() { return timer; } @@ -131,7 +140,7 @@ public class NettyComponent extends UriEndpointComponent { // we should use a shared thread pool as recommended by Netty String pattern = getCamelContext().getExecutorServiceManager().getThreadNamePattern(); ThreadFactory factory = new CamelThreadFactory(pattern, "NettyOrderedWorker", true); - return new OrderedMemoryAwareThreadPoolExecutor(configuration.getMaximumPoolSize(), + return new OrderedMemoryAwareThreadPoolExecutor(getMaximumPoolSize(), 0L, 0L, 30, TimeUnit.SECONDS, factory); } http://git-wip-us.apache.org/repos/asf/camel/blob/9d7440cf/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java index 8caf41e..97023a2 100644 --- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java +++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java @@ -76,7 +76,7 @@ public class NettyConfiguration extends NettyServerBootstrapConfiguration implem private boolean allowDefaultCodec = true; @UriParam private ClientPipelineFactory clientPipelineFactory; - @UriParam + //CAMEL-8031 Moved this option to NettyComponent private int maximumPoolSize = 16; @UriParam private boolean orderedThreadPoolExecutor = true;
