[camel] branch master updated: CAMEL-15062: Fixed camel-rabbitmq setting args multivalue in endpoint.

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 407041c  CAMEL-15062: Fixed camel-rabbitmq setting args multivalue in 
endpoint.
407041c is described below

commit 407041cc338f0491536948d30789c77e7e0e6f60
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri May 15 11:12:10 2020 +0200

    CAMEL-15062: Fixed camel-rabbitmq setting args multivalue in endpoint.
---
 .../java/org/apache/camel/component/rabbitmq/RabbitMQComponent.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQComponent.java
 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQComponent.java
index b300df7..a63bf95 100644
--- 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQComponent.java
+++ 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQComponent.java
@@ -248,7 +248,6 @@ public class RabbitMQComponent extends DefaultComponent {
         endpoint.setDeadLetterRoutingKey(getDeadLetterRoutingKey());
         endpoint.setAllowNullHeaders(isAllowNullHeaders());
         
endpoint.setConnectionFactoryExceptionHandler(getConnectionFactoryExceptionHandler());
-        setProperties(endpoint, params);
 
         if (LOG.isDebugEnabled()) {
             LOG.debug("Creating RabbitMQEndpoint with host {}:{} and 
exchangeName: {}",
@@ -268,9 +267,13 @@ public class RabbitMQComponent extends DefaultComponent {
             endpoint.setArgs(localArgs);
         }
 
+        // must extract args (above) before setting generic properties
+        setProperties(endpoint, params);
+
         // Change null headers processing for message converter
         
endpoint.getMessageConverter().setAllowNullHeaders(endpoint.isAllowNullHeaders());
         
endpoint.getMessageConverter().setAllowCustomHeaders(endpoint.isAllowCustomHeaders());
+
         return endpoint;
     }