[camel] branch master updated: CAMEL-16078: move camel-caffeine-lrucache from core to components

[davsclaus]

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.git


The following commit(s) were added to refs/heads/master by this push:
     new d970b72  CAMEL-16078: move camel-caffeine-lrucache from core to 
components
d970b72 is described below

commit d970b72042498bc426a77d6257e651bff42ba63e
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Jan 27 18:05:48 2021 +0100

    CAMEL-16078: move camel-caffeine-lrucache from core to components
---
 .../java/org/apache/camel/impl/engine/AbstractCamelContext.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 0b8686e..a7c0cbc 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
@@ -769,6 +769,7 @@ public abstract class AbstractCamelContext extends 
BaseService
             answer.add(oldEndpoint);
             stopServices(oldEndpoint);
         } else {
+            List<EndpointKey> toRemove = new ArrayList<>();
             for (Map.Entry<EndpointKey, Endpoint> entry : 
endpoints.entrySet()) {
                 oldEndpoint = entry.getValue();
                 if (EndpointHelper.matchEndpoint(this, 
oldEndpoint.getEndpointUri(), uri)) {
@@ -778,9 +779,12 @@ public abstract class AbstractCamelContext extends 
BaseService
                         LOG.warn("Error stopping endpoint " + oldEndpoint + ". 
This exception will be ignored.", e);
                     }
                     answer.add(oldEndpoint);
-                    endpoints.remove(entry.getKey());
+                    toRemove.add(entry.getKey());
                 }
             }
+            for (EndpointKey key : toRemove) {
+                endpoints.remove(key);
+            }
         }
 
         // notify lifecycle its being removed