This is an automated email from the ASF dual-hosted git repository. davsclaus 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 f29a9a18ec8 CAMEL-20613: set AbstractCamelContext#endpointStrategies to ConcurrentHashSet to prevent ConcurrentModificationException (#13820) f29a9a18ec8 is described below commit f29a9a18ec85454bf7a28a102c0a498bcb48a0b8 Author: Bartosz Popiela <bartosz...@gmail.com> AuthorDate: Thu Apr 18 13:11:13 2024 +0200 CAMEL-20613: set AbstractCamelContext#endpointStrategies to ConcurrentHashSet to prevent ConcurrentModificationException (#13820) If a thread iterates over the list of strategies while another thread adds a new strategy, ConcurrentModificationException is thrown. To fix this issue, AbstractCamelContext#endpointStrategies can be set to a thread-safe collection. --- .../org/apache/camel/impl/engine/AbstractCamelContext.java | 4 ++-- .../camel/impl/engine/DefaultCamelContextExtension.java | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 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 07f9e92d11b..59eb0afd92c 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 @@ -207,7 +207,7 @@ public abstract class AbstractCamelContext extends BaseService private final DefaultCamelContextExtension camelContextExtension = new DefaultCamelContextExtension(this); private final AtomicInteger endpointKeyCounter = new AtomicInteger(); - private final List<EndpointStrategy> endpointStrategies = new ArrayList<>(); + private final Set<EndpointStrategy> endpointStrategies = ConcurrentHashMap.newKeySet(); private final GlobalEndpointConfiguration globalEndpointConfiguration = new DefaultGlobalEndpointConfiguration(); private final Map<String, Component> components = new ConcurrentHashMap<>(); private final Set<Route> routes = new LinkedHashSet<>(); @@ -4159,7 +4159,7 @@ public abstract class AbstractCamelContext extends BaseService return camelContextExtension.getRegistry(); } - List<EndpointStrategy> getEndpointStrategies() { + Set<EndpointStrategy> getEndpointStrategies() { return endpointStrategies; } diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java index 9dc144e8912..80c3c3161c0 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java @@ -269,15 +269,17 @@ class DefaultCamelContextExtension implements ExtendedCamelContext { @Override public void registerEndpointCallback(EndpointStrategy strategy) { - if (!camelContext.getEndpointStrategies().contains(strategy)) { - // let it be invoked for already registered endpoints so it can - // catch-up. - camelContext.getEndpointStrategies().add(strategy); + // let it be invoked for already registered endpoints so it can + // catch-up. + if (camelContext.getEndpointStrategies().add(strategy)) { for (Endpoint endpoint : camelContext.getEndpoints()) { - Endpoint newEndpoint = strategy.registerEndpoint(endpoint.getEndpointUri(), endpoint); + Endpoint newEndpoint = strategy.registerEndpoint(endpoint.getEndpointUri(), + endpoint); if (newEndpoint != null) { // put will replace existing endpoint with the new endpoint - camelContext.getEndpointRegistry().put(camelContext.getEndpointKey(endpoint.getEndpointUri()), newEndpoint); + camelContext.getEndpointRegistry() + .put(camelContext.getEndpointKey(endpoint.getEndpointUri()), + newEndpoint); } } }