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 2013/12/07 15:15:27 UTC
git commit: CAMEL-7044 Ignoring the rabbitmq.ROUTING_KEY when
bridgeEndpoint option is true
Updated Branches:
refs/heads/camel-2.12.x a351d3dcf -> 839f5aca7
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/839f5aca
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/839f5aca
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/839f5aca
Branch: refs/heads/camel-2.12.x
Commit: 839f5aca77daddd0dae9f3cb89e68a07136097d5
Parents: a351d3d
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Dec 6 10:11:44 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sat Dec 7 22:15:06 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/839f5aca/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)) {