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 2016/02/04 19:43:40 UTC

[2/2] camel git commit: CAMEL-9560: RabbitMQ InOut Producer generates a null body response when a correlationId is used. Thanks to Arnaud Chotard for the patch.

CAMEL-9560: RabbitMQ InOut Producer generates a null body response when a correlationId is used. Thanks to Arnaud Chotard for the patch.


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

Branch: refs/heads/camel-2.16.x
Commit: 96e9c8f054db497d229ce95c266c1a74838bee2a
Parents: 8a0de6f
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Feb 4 19:42:35 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Feb 4 19:43:03 2016 +0100

----------------------------------------------------------------------
 .../apache/camel/component/rabbitmq/reply/ReplyManagerSupport.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/96e9c8f0/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyManagerSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyManagerSupport.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyManagerSupport.java
index f4f4711..3561dc2 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyManagerSupport.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyManagerSupport.java
@@ -146,7 +146,7 @@ public abstract class ReplyManagerSupport extends ServiceSupport implements Repl
 
                     // restore correlation id in case the remote server messed with it
                     if (holder.getOriginalCorrelationId() != null) {
-                        if (exchange.getOut() != null) {
+                        if (exchange.hasOut()) {
                             exchange.getOut().setHeader(RabbitMQConstants.CORRELATIONID, holder.getOriginalCorrelationId());
                         } else {
                             exchange.getIn().setHeader(RabbitMQConstants.CORRELATIONID, holder.getOriginalCorrelationId());