You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/10/31 19:56:56 UTC

[4/4] git commit: CAMEL-6921: Fixed netty producer to not cause NPE later in messageReceived when destoying channel from pool

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/225a69eb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/225a69eb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/225a69eb

Branch: refs/heads/camel-2.10.x
Commit: 225a69eba477cfed1c9e1e507b05b23b1e37519c
Parents: e82146f
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Oct 31 19:55:58 2013 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Oct 31 19:57:32 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/225a69eb/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 a5cb5ad..5dc9154 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
@@ -477,8 +477,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