From 387f19550b65325331c3489b7e56a2b48bd5add2 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Sat, 27 Apr 2013 14:15:58 +0000 Subject: QPID-4782: use iterator.remove() to update the map and avoid the CME exposed in r1476219 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1476583 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/qpid/server/model/adapter/ConnectionAdapter.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'qpid/java/broker/src') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java index 2ecd9a6431..878d4f0034 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java @@ -26,6 +26,7 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -64,14 +65,19 @@ final class ConnectionAdapter extends AbstractAdapter implements Connection synchronized (_sessionAdapters) { - for(AMQSessionModel session : _sessionAdapters.keySet()) + Iterator iterator = _sessionAdapters.keySet().iterator(); + while(iterator.hasNext()) { + AMQSessionModel session = iterator.next(); if(!actualSessions.contains(session)) { - SessionAdapter adapter = _sessionAdapters.remove(session); + SessionAdapter adapter = _sessionAdapters.get(session); + iterator.remove(); + childRemoved(adapter); // Trigger corresponding ConfigurationChangeListener childRemoved() callback. } } + for(AMQSessionModel session : actualSessions) { if(!_sessionAdapters.containsKey(session)) @@ -81,6 +87,7 @@ final class ConnectionAdapter extends AbstractAdapter implements Connection childAdded(adapter); // Trigger corresponding ConfigurationChangeListener childAdded() callback. } } + return new ArrayList(_sessionAdapters.values()); } } -- cgit v1.2.1