camel git commit: CAMEL-8694: java.lang.NullPointerException in at org.apache.camel.component.netty4.http.NettyHttpProducer.done

2015-04-24 Thread cmueller
Repository: camel
Updated Branches:
  refs/heads/master 3a68f1242 - dbd6b584e


CAMEL-8694: java.lang.NullPointerException in at 
org.apache.camel.component.netty4.http.NettyHttpProducer.done


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dbd6b584
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dbd6b584
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dbd6b584

Branch: refs/heads/master
Commit: dbd6b584e02f5ce0ae46e50d2f4ee6a2785dd7d4
Parents: 3a68f12
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Apr 24 23:26:18 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Apr 24 23:26:18 2015 +0200

--
 .../org/apache/camel/component/netty4/http/NettyHttpProducer.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/dbd6b584/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
--
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
index c021494..f88b0b2 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
@@ -95,8 +95,8 @@ public class NettyHttpProducer extends NettyProducer {
 FullHttpResponse response = nettyMessage.getHttpResponse();
 // Need to retain the ByteBuffer for producer to consumer
 // TODO Remove this part of ByteBuffer right away
-response.content().retain();
 if (response != null) {
+response.content().retain();
 // the actual url is stored on the IN message in the 
getRequestBody method as its accessed on-demand
 String actualUrl = 
exchange.getIn().getHeader(Exchange.HTTP_URL, String.class);
 int code = response.getStatus() != null ? 
response.getStatus().code() : -1;
@@ -116,5 +116,4 @@ public class NettyHttpProducer extends NettyProducer {
 }
 }
 }
-
 }



camel git commit: CAMEL-8694: java.lang.NullPointerException in at org.apache.camel.component.netty4.http.NettyHttpProducer.done

2015-04-24 Thread cmueller
Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x f51e06167 - 9a69b3686


CAMEL-8694: java.lang.NullPointerException in at 
org.apache.camel.component.netty4.http.NettyHttpProducer.done


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9a69b368
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9a69b368
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9a69b368

Branch: refs/heads/camel-2.15.x
Commit: 9a69b3686ff9031d82ebe9ab357af42382765395
Parents: f51e061
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Apr 24 23:26:18 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Apr 24 23:27:16 2015 +0200

--
 .../org/apache/camel/component/netty4/http/NettyHttpProducer.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9a69b368/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
--
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
index c021494..f88b0b2 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
@@ -95,8 +95,8 @@ public class NettyHttpProducer extends NettyProducer {
 FullHttpResponse response = nettyMessage.getHttpResponse();
 // Need to retain the ByteBuffer for producer to consumer
 // TODO Remove this part of ByteBuffer right away
-response.content().retain();
 if (response != null) {
+response.content().retain();
 // the actual url is stored on the IN message in the 
getRequestBody method as its accessed on-demand
 String actualUrl = 
exchange.getIn().getHeader(Exchange.HTTP_URL, String.class);
 int code = response.getStatus() != null ? 
response.getStatus().code() : -1;
@@ -116,5 +116,4 @@ public class NettyHttpProducer extends NettyProducer {
 }
 }
 }
-
 }



camel git commit: CAMEL-8694: java.lang.NullPointerException in at org.apache.camel.component.netty4.http.NettyHttpProducer.done

2015-04-24 Thread cmueller
Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x 6a1bfc63c - bd1f252f8


CAMEL-8694: java.lang.NullPointerException in at 
org.apache.camel.component.netty4.http.NettyHttpProducer.done


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bd1f252f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bd1f252f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bd1f252f

Branch: refs/heads/camel-2.14.x
Commit: bd1f252f81dd8a117f9466a5c0ee528b8e7a4763
Parents: 6a1bfc6
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Apr 24 23:26:18 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Apr 24 23:30:02 2015 +0200

--
 .../org/apache/camel/component/netty4/http/NettyHttpProducer.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bd1f252f/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
--
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
index c021494..f88b0b2 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
@@ -95,8 +95,8 @@ public class NettyHttpProducer extends NettyProducer {
 FullHttpResponse response = nettyMessage.getHttpResponse();
 // Need to retain the ByteBuffer for producer to consumer
 // TODO Remove this part of ByteBuffer right away
-response.content().retain();
 if (response != null) {
+response.content().retain();
 // the actual url is stored on the IN message in the 
getRequestBody method as its accessed on-demand
 String actualUrl = 
exchange.getIn().getHeader(Exchange.HTTP_URL, String.class);
 int code = response.getStatus() != null ? 
response.getStatus().code() : -1;
@@ -116,5 +116,4 @@ public class NettyHttpProducer extends NettyProducer {
 }
 }
 }
-
 }