diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java index 3fea35c5052..130ad466974 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java @@ -706,12 +706,14 @@ public class SingleConnectionFactory implements ConnectionFactory, QueueConnecti @Override public void onException(JMSException ex) { + // Iterate over temporary copy in order to avoid ConcurrentModificationException, + // since listener invocations may in turn trigger registration of listeners... + Set copy; synchronized (connectionMonitor) { - // Iterate over temporary copy in order to avoid ConcurrentModificationException, - // since listener invocations may in turn trigger registration of listeners... - for (ExceptionListener listener : new LinkedHashSet<>(this.delegates)) { - listener.onException(ex); - } + copy = new LinkedHashSet<>(this.delegates); + } + for (ExceptionListener listener : copy) { + listener.onException(ex); } } }