You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/10/17 15:19:10 UTC
[camel] branch main updated: CAMEL-19998: hide route startup order count
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 6d2d0c31c89 CAMEL-19998: hide route startup order count
6d2d0c31c89 is described below
commit 6d2d0c31c89bfce877bbe570dab9e572996f77b3
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Oct 17 16:55:42 2023 +0200
CAMEL-19998: hide route startup order count
---
.../java/org/apache/camel/impl/engine/AbstractCamelContext.java | 4 +---
.../org/apache/camel/impl/engine/InternalRouteStartupManager.java | 7 ++++++-
2 files changed, 7 insertions(+), 4 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 5f4d7f6ca8b..288309f36ef 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
@@ -197,8 +197,6 @@ public abstract class AbstractCamelContext extends BaseService
protected final InternalServiceManager internalServiceManager;
- int defaultRouteStartupOrder = 1000;
-
private final DefaultCamelContextExtension camelContextExtension = new DefaultCamelContextExtension(this);
private final AtomicInteger endpointKeyCounter = new AtomicInteger();
private final List<EndpointStrategy> endpointStrategies = new ArrayList<>();
@@ -1883,7 +1881,7 @@ public abstract class AbstractCamelContext extends BaseService
Route route = entry.getValue().getRoute();
Integer order = route.getStartupOrder();
if (order == null) {
- order = defaultRouteStartupOrder++;
+ order = internalRouteStartupManager.incrementRouteStartupOrder();
}
orders.add(new DefaultRouteStartupOrder(order, route, entry.getValue()));
}
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java
index 9ec0a6fff4d..16cc6f38466 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/InternalRouteStartupManager.java
@@ -57,6 +57,7 @@ class InternalRouteStartupManager {
private final ThreadLocal<Route> setupRoute = new ThreadLocal<>();
private final AbstractCamelContext abstractCamelContext;
private final CamelLogger routeLogger = new CamelLogger(LOG);
+ private int defaultRouteStartupOrder = 1000;
public InternalRouteStartupManager(AbstractCamelContext abstractCamelContext) {
this.abstractCamelContext = abstractCamelContext;
@@ -247,7 +248,7 @@ class InternalRouteStartupManager {
Integer startupOrder = routeService.getRoute().getStartupOrder();
if (startupOrder == null) {
// auto assign a default startup order
- startupOrder = abstractCamelContext.defaultRouteStartupOrder++;
+ startupOrder = defaultRouteStartupOrder++;
}
// create holder object that contains information about this route to be
@@ -468,4 +469,8 @@ class InternalRouteStartupManager {
return true;
}
+ int incrementRouteStartupOrder() {
+ return defaultRouteStartupOrder++;
+ }
+
}