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 2017/10/06 08:30:09 UTC
[4/4] camel git commit: Polished and fixed typo. This closes #2010
Polished and fixed typo. This closes #2010
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ebb46784
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ebb46784
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ebb46784
Branch: refs/heads/camel-2.19.x
Commit: ebb467848b1f55b2509d4df908c3d7a5de984db5
Parents: a57a06e
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 6 10:29:21 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 6 10:29:59 2017 +0200
----------------------------------------------------------------------
.../apache/camel/component/rabbitmq/RabbitMQConstants.java | 2 +-
.../camel/component/rabbitmq/RabbitMQDeclareSupport.java | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ebb46784/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java
index fc6a326..cc7bf32 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java
@@ -42,7 +42,7 @@ public final class RabbitMQConstants {
public static final String RABBITMQ_DEAD_LETTER_ROUTING_KEY = "x-dead-letter-routing-key";
public static final String RABBITMQ_DIRECT_REPLY_EXCHANGE = "";
public static final String RABBITMQ_DIRECT_REPLY_ROUTING_KEY = "amq.rabbitmq.reply-to";
- public static final String RABBITMQ_QUEUE_LENGHT_LIMIT_KEY = "x-max-length";
+ public static final String RABBITMQ_QUEUE_LENGTH_LIMIT_KEY = "x-max-length";
public static final String RABBITMQ_QUEUE_MESSAGE_TTL_KEY = "x-message-ttl";
public static final String RABBITMQ_QUEUE_TTL_KEY = "x-expires";
http://git-wip-us.apache.org/repos/asf/camel/blob/ebb46784/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
index 03fc325..391f086 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
@@ -65,9 +65,10 @@ public class RabbitMQDeclareSupport {
}
private void formatSpecialQueueArguments(Map<String, Object> queueArgs) {
- Object queueLengthLimit = queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_LENGHT_LIMIT_KEY);
+ // some arguments must be in numeric values so we need to fix this
+ Object queueLengthLimit = queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_LENGTH_LIMIT_KEY);
if (queueLengthLimit != null && queueLengthLimit instanceof String) {
- queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_LENGHT_LIMIT_KEY, Long.parseLong((String) queueLengthLimit));
+ queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_LENGTH_LIMIT_KEY, Long.parseLong((String) queueLengthLimit));
}
Object queueMessageTtl = queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_MESSAGE_TTL_KEY);
@@ -81,13 +82,11 @@ public class RabbitMQDeclareSupport {
}
}
- private Map<String, Object> populateQueueArgumentsFromDeadLetterExchange(final Map<String, Object> queueArgs) {
+ private void populateQueueArgumentsFromDeadLetterExchange(final Map<String, Object> queueArgs) {
if (endpoint.getDeadLetterExchange() != null) {
queueArgs.put(RabbitMQConstants.RABBITMQ_DEAD_LETTER_EXCHANGE, endpoint.getDeadLetterExchange());
queueArgs.put(RabbitMQConstants.RABBITMQ_DEAD_LETTER_ROUTING_KEY, endpoint.getDeadLetterRoutingKey());
}
-
- return queueArgs;
}
private Map<String, Object> resolvedExchangeArguments() {