[camel] branch master updated: CAMEL-13557: Fixed test to use property binding support as the old has removed the legacy JDK PropertyEditor in CAMEL-13566

[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 039479d  CAMEL-13557: Fixed test to use property binding support as 
the old has removed the legacy JDK PropertyEditor in CAMEL-13566
039479d is described below

commit 039479d913d68a40648de0efd7051368f12dff2a
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat May 25 21:13:42 2019 +0200

    CAMEL-13557: Fixed test to use property binding support as the old has 
removed the legacy JDK PropertyEditor in CAMEL-13566
---
 .../java/org/apache/camel/component/mail/MailComponent.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
 
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
index 1b09c0e..7c119d3 100644
--- 
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
+++ 
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
@@ -99,11 +99,6 @@ public class MailComponent extends 
HeaderFilterStrategyComponent implements SSLC
             endpoint.setSortTerm(st);
         }
 
-        endpoint.setContentTypeResolver(contentTypeResolver);
-        setEndpointHeaderFilterStrategy(endpoint);
-        setProperties(endpoint.getConfiguration(), parameters);
-        setProperties(endpoint, parameters);
-
         // special for searchTerm.xxx options
         Map<String, Object> sstParams = 
IntrospectionSupport.extractProperties(parameters, "searchTerm.");
         if (!sstParams.isEmpty()) {
@@ -114,6 +109,11 @@ public class MailComponent extends 
HeaderFilterStrategyComponent implements SSLC
             endpoint.setSearchTerm(st);
         }
 
+        endpoint.setContentTypeResolver(contentTypeResolver);
+        setEndpointHeaderFilterStrategy(endpoint);
+        setProperties(endpoint.getConfiguration(), parameters);
+        setProperties(endpoint, parameters);
+
         // sanity check that we know the mail server
         StringHelper.notEmpty(config.getHost(), "host");
         StringHelper.notEmpty(config.getProtocol(), "protocol");