You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/10/20 14:30:20 UTC
[1/2] git commit: CAMEL-7915 Fixed some test error when using netty
producer with recipientList
Repository: camel
Updated Branches:
refs/heads/camel-2.13.x b0a2bfdee -> 80015c52a
refs/heads/camel-2.14.x ae61e340d -> ee9f56261
CAMEL-7915 Fixed some test error when using netty producer with recipientList
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ee9f5626
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ee9f5626
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ee9f5626
Branch: refs/heads/camel-2.14.x
Commit: ee9f56261475fa492a7a179ae721fbb6f848d024
Parents: ae61e34
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Oct 20 20:17:56 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Oct 20 20:29:17 2014 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/component/netty/NettyComponent.java | 4 +++-
.../java/org/apache/camel/component/netty/NettyProducer.java | 6 +-----
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ee9f5626/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 11c37e0..810ea8d 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
@@ -109,7 +109,9 @@ public class NettyComponent extends UriEndpointComponent {
@Override
protected void doStart() throws Exception {
if (timer == null) {
- timer = new HashedWheelTimer();
+ HashedWheelTimer hashedWheelTimer = new HashedWheelTimer();
+ hashedWheelTimer.start();
+ timer = hashedWheelTimer;
}
if (configuration == null) {
http://git-wip-us.apache.org/repos/asf/camel/blob/ee9f5626/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 7be6a21..5856050 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
@@ -153,11 +153,7 @@ public class NettyProducer extends DefaultAsyncProducer {
ChannelGroupFuture future = allChannels.close();
future.awaitUninterruptibly();
- // and then release other resources
- if (channelFactory != null) {
- channelFactory.releaseExternalResources();
- }
-
+ // release the external resource here and we keep the timer open
// and then shutdown the thread pools
if (bossPool != null) {
bossPool.shutdown();
[2/2] git commit: CAMEL-7915 Fixed some test error when using netty
producer with recipientList
Posted by ni...@apache.org.
CAMEL-7915 Fixed some test error when using netty producer with recipientList
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/80015c52
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/80015c52
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/80015c52
Branch: refs/heads/camel-2.13.x
Commit: 80015c52a521011ecc785c3f18e669b823c42906
Parents: b0a2bfd
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Oct 20 20:17:56 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Oct 20 20:29:25 2014 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/component/netty/NettyComponent.java | 4 +++-
.../java/org/apache/camel/component/netty/NettyProducer.java | 6 +-----
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/80015c52/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 a570df8..55ffa86 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
@@ -104,7 +104,9 @@ public class NettyComponent extends DefaultComponent {
@Override
protected void doStart() throws Exception {
if (timer == null) {
- timer = new HashedWheelTimer();
+ HashedWheelTimer hashedWheelTimer = new HashedWheelTimer();
+ hashedWheelTimer.start();
+ timer = hashedWheelTimer;
}
if (configuration == null) {
http://git-wip-us.apache.org/repos/asf/camel/blob/80015c52/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 7be6a21..5856050 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
@@ -153,11 +153,7 @@ public class NettyProducer extends DefaultAsyncProducer {
ChannelGroupFuture future = allChannels.close();
future.awaitUninterruptibly();
- // and then release other resources
- if (channelFactory != null) {
- channelFactory.releaseExternalResources();
- }
-
+ // release the external resource here and we keep the timer open
// and then shutdown the thread pools
if (bossPool != null) {
bossPool.shutdown();