camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/4] git commit: CAMEL-6921: Fixed netty producer to not cause NPE later in messageReceived when destoying channel from pool
Date Thu, 31 Oct 2013 18:56:54 GMT
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/91332f8f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/91332f8f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/91332f8f

Branch: refs/heads/camel-2.12.x
Commit: 91332f8f91a1836fe1e53643259a8881425d756d
Parents: c2358e5
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Thu Oct 31 19:55:58 2013 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Thu Oct 31 19:57:02 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/91332f8f/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


Mime
View raw message