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:53 UTC
[1/4] git commit: CAMEL-6921: Fixed netty producer to not cause NPE
later in messageReceived when destoying channel from pool
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 <da...@apache.org>
Authored: Thu Oct 31 19:55:58 2013 +0100
Committer: Claus Ibsen <da...@apache.org>
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
[2/4] git commit: CAMEL-6921: Fixed netty producer to not cause NPE
later in messageReceived when destoying channel from pool
Posted by da...@apache.org.
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 <da...@apache.org>
Authored: Thu Oct 31 19:55:58 2013 +0100
Committer: Claus Ibsen <da...@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
[3/4] git commit: CAMEL-6921: Fixed netty producer to not cause NPE
later in messageReceived when destoying channel from pool
Posted by da...@apache.org.
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/f50a6182
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f50a6182
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f50a6182
Branch: refs/heads/camel-2.11.x
Commit: f50a6182906e337ef72c7fd19afd826339c898b2
Parents: 73a66bc
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:16 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/f50a6182/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 d3012e3..a6c5a7e 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
@@ -479,8 +479,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
[4/4] git commit: CAMEL-6921: Fixed netty producer to not cause NPE
later in messageReceived when destoying channel from pool
Posted by da...@apache.org.
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