This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 92aa43296c14c20dd8da4675737416c988d77160 Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Tue Feb 11 17:23:54 2020 +0100 Configure specific options sooner rather than later --- .../src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java | 2 +- .../main/java/org/apache/camel/component/cron/SpringCronEndpoint.java | 2 +- .../src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java index ec7239b..255407e 100644 --- a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java +++ b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java @@ -173,11 +173,11 @@ public class JpaEndpoint extends ScheduledPollEndpoint { @Override public void configureProperties(Map<String, Object> options) { - super.configureProperties(options); Map<String, Object> emProperties = PropertiesHelper.extractProperties(options, "emf."); if (!emProperties.isEmpty()) { setEntityManagerProperties(emProperties); } + super.configureProperties(options); } @Override diff --git a/components/camel-spring/src/main/java/org/apache/camel/component/cron/SpringCronEndpoint.java b/components/camel-spring/src/main/java/org/apache/camel/component/cron/SpringCronEndpoint.java index 2aa262d..b016f49 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/component/cron/SpringCronEndpoint.java +++ b/components/camel-spring/src/main/java/org/apache/camel/component/cron/SpringCronEndpoint.java @@ -33,10 +33,10 @@ public class SpringCronEndpoint extends ScheduledPollEndpoint { @Override public void configureProperties(Map<String, Object> options) { + configureScheduledPollConsumerProperties(options); PropertyBindingSupport.build().withPlaceholder(false).withNesting(false) .withDeepNesting(false).withReference(false) .bind(getCamelContext(), this, options); - configureScheduledPollConsumerProperties(options); } @Override diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java index 9eaad27..b969f41 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java @@ -109,8 +109,8 @@ public abstract class ScheduledPollEndpoint extends DefaultEndpoint { @Override public void configureProperties(Map<String, Object> options) { - super.configureProperties(options); configureScheduledPollConsumerProperties(options); + super.configureProperties(options); } protected void configureScheduledPollConsumerProperties(Map<String, Object> options) {