CAMEL-7044 Ignoring the rabbitmq.ROUTING_KEY when bridgeEndpoint option is true


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

Branch: refs/heads/camel-gora
Commit: 3227252208d35e89bad74ff5095421ce2de85ffa
Parents: 278761b
Author: Willem Jiang <willem.ji...@gmail.com>
Authored: Fri Dec 6 10:11:44 2013 +0800
Committer: Willem Jiang <willem.ji...@gmail.com>
Committed: Sat Dec 7 22:12:29 2013 +0800

----------------------------------------------------------------------
 .../org/apache/camel/component/rabbitmq/RabbitMQProducer.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/32272522/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
----------------------------------------------------------------------
diff --git 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
index 9e22886..7763423 100644
--- 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
+++ 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
@@ -85,8 +85,8 @@ public class RabbitMQProducer extends DefaultProducer {
             exchangeName = getEndpoint().getExchangeName();
         }
         String key = exchange.getIn().getHeader(RabbitMQConstants.ROUTING_KEY, 
null, String.class);
-        // we just need to make sure RoutingKey option take effect
-        if (key == null) {
+        // we just need to make sure RoutingKey option take effect if it is 
not BridgeEndpoint
+        if (key == null || getEndpoint().isBridgeEndpoint()) {
             key = getEndpoint().getRoutingKey() == null ? "" : 
getEndpoint().getRoutingKey();
         }
         if (ObjectHelper.isEmpty(key) && ObjectHelper.isEmpty(exchangeName)) {

Reply via email to