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 2015/07/09 07:54:28 UTC
camel git commit: Fixed todos
Repository: camel
Updated Branches:
refs/heads/master bcc87937e -> 167037525
Fixed todos
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/16703752
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/16703752
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/16703752
Branch: refs/heads/master
Commit: 1670375251279010fbad1f2764f9e75919866948
Parents: bcc8793
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jul 9 07:59:46 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 9 07:59:46 2015 +0200
----------------------------------------------------------------------
components/camel-netty4/pom.xml | 23 +-------------------
.../netty4/handlers/ClientChannelHandler.java | 1 -
2 files changed, 1 insertion(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/16703752/components/camel-netty4/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-netty4/pom.xml b/components/camel-netty4/pom.xml
index 2f1ad8a..96f4597 100644
--- a/components/camel-netty4/pom.xml
+++ b/components/camel-netty4/pom.xml
@@ -40,30 +40,9 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
- <!-- TODO: use netty-all and ${netty-version} when upgrading to Netty 4.x -->
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-codec</artifactId>
- <version>${netty-version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
- <version>${netty-version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- <version>${netty-version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- <version>${netty-version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
+ <artifactId>netty-all</artifactId>
<version>${netty-version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/16703752/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
index d4651a9..b16b0f1 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
@@ -119,7 +119,6 @@ public class ClientChannelHandler extends SimpleChannelInboundHandler<Object> {
@Override
protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception {
- // TODO Auto-generated method stub
messageReceived = true;
if (LOG.isTraceEnabled()) {