camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [camel-spring-boot] branch master updated: CAMEL-14737: Do not use camel shutdown hook with spring boot as spring boot has its own hook
Date Thu, 07 May 2020 14:11:35 GMT
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-spring-boot.git


The following commit(s) were added to refs/heads/master by this push:
     new 2fa78f6  CAMEL-14737: Do not use camel shutdown hook with spring boot as spring boot
has its own hook
2fa78f6 is described below

commit 2fa78f63a48e5ed14cf9fde1adeee449417e4980
Author: Claus Ibsen <claus.ibsen@gmail.com>
AuthorDate: Thu May 7 16:11:19 2020 +0200

    CAMEL-14737: Do not use camel shutdown hook with spring boot as spring boot has its own
hook
---
 .../camel/spring/boot/CamelSpringBootApplicationController.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java
index 38a208a..0dc546a 100644
--- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java
+++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java
@@ -39,7 +39,11 @@ public class CamelSpringBootApplicationController {
     public CamelSpringBootApplicationController(final ApplicationContext applicationContext,
final CamelContext context) {
         this.main = new Main() {
 
-            { this.camelContext = context; }
+            {
+                this.camelContext = context;
+                // disable shutdown hook as spring-boot has its own hook we use
+                this.disableHangupSupport();
+            }
 
             @Override
             protected ProducerTemplate findOrCreateCamelTemplate() {


Mime
View raw message