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 2020/03/30 19:24:29 UTC
[camel] branch master updated (bfb7b81 -> d113ef8)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from bfb7b81 Remove unused cdi-api-1.2-version placeholder.
new a1be553 CAMEL-14805: Use doInit for iniitalizing. Fixed supervising route controller. Fixed tests in camel-spring-boot
new d113ef8 Upgrade spring boot
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/impl/engine/SupervisingRouteController.java | 9 ++++++---
parent/pom.xml | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
[camel] 01/02: CAMEL-14805: Use doInit for iniitalizing. Fixed
supervising route controller. Fixed tests in camel-spring-boot
Posted by da...@apache.org.
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
commit a1be553016bf8f6906e042266c88f4f76602bf6a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Mar 30 20:36:59 2020 +0200
CAMEL-14805: Use doInit for iniitalizing. Fixed supervising route controller. Fixed tests in camel-spring-boot
---
.../org/apache/camel/impl/engine/SupervisingRouteController.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/SupervisingRouteController.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/SupervisingRouteController.java
index 2f2df57..890960a 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/SupervisingRouteController.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/SupervisingRouteController.java
@@ -194,14 +194,17 @@ public class SupervisingRouteController extends DefaultRouteController {
// *********************************
@Override
- protected void doStart() throws Exception {
- final CamelContext context = getCamelContext();
-
+ protected void doInit() throws Exception {
+ CamelContext context = getCamelContext();
context.setAutoStartup(false);
context.addRoutePolicyFactory(new ManagedRoutePolicyFactory());
context.addStartupListener(this.listener);
context.getManagementStrategy().addEventNotifier(this.listener);
+ }
+ @Override
+ protected void doStart() throws Exception {
+ CamelContext context = getCamelContext();
executorService = context.getExecutorServiceManager().newSingleThreadScheduledExecutor(this, "SupervisingRouteController");
timer = new BackOffTimer(executorService);
}
[camel] 02/02: Upgrade spring boot
Posted by da...@apache.org.
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
commit d113ef8b3ae6464ed6df5ef4c83f48b954d1515c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Mar 30 21:23:06 2020 +0200
Upgrade spring boot
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 6785c83..f02f444 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -530,7 +530,7 @@
<splunk-version>1.6.5.0_1</splunk-version>
<spring-batch-version>4.2.1.RELEASE</spring-batch-version>
<spring-batch-bundle-version>4.2.1.RELEASE_1</spring-batch-bundle-version>
- <spring-boot-version>2.2.5.RELEASE</spring-boot-version>
+ <spring-boot-version>2.2.6.RELEASE</spring-boot-version>
<spring-data-commons-bundle-version>2.2.4.RELEASE_1</spring-data-commons-bundle-version>
<spring-data-keyvalue-bundle-version>2.2.4.RELEASE_1</spring-data-keyvalue-bundle-version>
<spring-data-redis-version>2.2.4.RELEASE</spring-data-redis-version>