Updated Branches: refs/heads/camel-2.10.x e82146f12 -> 225a69eba refs/heads/camel-2.11.x 73a66bcab -> f50a61829 refs/heads/camel-2.12.x c2358e5cc -> 91332f8f9 refs/heads/master 96e9ed48f -> d662d94f4
CAMEL-6921: Fixed netty producer to not cause NPE later in messageReceived when destoying channel from pool Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d662d94f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d662d94f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d662d94f Branch: refs/heads/master Commit: d662d94f42ccbf16b5a277e573a191f9d29c6d6a Parents: 96e9ed4 Author: Claus Ibsen <[email protected]> Authored: Thu Oct 31 19:55:58 2013 +0100 Committer: Claus Ibsen <[email protected]> Committed: Thu Oct 31 19:55:58 2013 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/camel/component/netty/NettyProducer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d662d94f/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java index f36e6f7..0129c7d 100644 --- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java +++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java @@ -509,8 +509,7 @@ public class NettyProducer extends DefaultAsyncProducer { @Override public void destroyObject(Channel channel) throws Exception { LOG.trace("Destroying channel: {}", channel); - NettyHelper.close(channel); - ALL_CHANNELS.remove(channel); + // noop } @Override
