This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch openapi in repository https://gitbox.apache.org/repos/asf/camel.git
commit bede4a88af3f5b743f15b1707c8a800ff186ae06 Author: Claus Ibsen <[email protected]> AuthorDate: Fri Oct 11 15:50:20 2024 +0200 camel-core: Fix potential NPE when stopping routes --- .../java/org/apache/camel/impl/engine/AbstractCamelContext.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java index 93940f7e738..e4ba371ffc1 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java @@ -1062,14 +1062,16 @@ public abstract class AbstractCamelContext extends BaseService routesOrdered.sort(comparator); for (RouteStartupOrder order : routesOrdered) { Route route = order.getRoute(); - boolean stopped = controller.getRouteStatus(route.getRouteId()).isStopped(); - if (!stopped) { + var status = controller.getRouteStatus(route.getRouteId()); + boolean stopped = status == null || status.isStopped(); + if (!stopped) {Fi stopRoute(route.getRouteId(), LoggingLevel.DEBUG); } } // stop any remainder routes for (Route route : getRoutes()) { - boolean stopped = controller.getRouteStatus(route.getRouteId()).isStopped(); + var status = controller.getRouteStatus(route.getRouteId()); + boolean stopped = status == null || status.isStopped(); if (!stopped) { stopRoute(route.getRouteId(), LoggingLevel.DEBUG); }
