Repository: camel Updated Branches: refs/heads/camel-2.17.x 646b6a107 -> a8ac8e322 refs/heads/camel-2.18.x df5e6a675 -> f2c5a0484 refs/heads/master 33615d381 -> 32c36c4ee
CAMEL-10384: Fixed shutdown of camel spring boot when using Camel main runner. Thanks to Artur Markiewicz for the patch. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/32c36c4e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/32c36c4e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/32c36c4e Branch: refs/heads/master Commit: 32c36c4eea1e7ea84f089f1db2fea34f636ba9ff Parents: 33615d3 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Oct 29 22:05:07 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Oct 29 22:05:07 2016 +0200 ---------------------------------------------------------------------- .../camel/spring/boot/CamelSpringBootApplicationController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/32c36c4e/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java index bbca474..c05b35a 100644 --- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java +++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java @@ -53,7 +53,8 @@ public class CamelSpringBootApplicationController { try { super.doStop(); } finally { - latch.countDown(); + // should use the latch on this instance + CamelSpringBootApplicationController.this.latch.countDown(); } } };
