mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

Spark 1804 copy on array list remove (#223)

Browse Source 
* SPARK-1804: Can't use iterator#remove() with CopyOnWrite.

* Prevent concurrent modification when closing a tab.
This commit is contained in:
Guus der Kinderen
2016-09-12 15:15:49 +02:00
committed by wroot
parent 3351238f20
commit 255e86afbf
1 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/java/org/jivesoftware/spark/ui/ChatRoom.java
View File

@ -1186,10 +1186,7 @@ public abstract class ChatRoom extends BackgroundPanel implements ActionListener
*/
public void addClosingListener(ChatRoomClosingListener listener)
{
synchronized ( closingListeners )
{
closingListeners.add( listener );
}
closingListeners.add( listener );
}
/**
@ -1199,10 +1196,7 @@ public abstract class ChatRoom extends BackgroundPanel implements ActionListener
*/
public void removeClosingListener(ChatRoomClosingListener listener)
{
synchronized ( closingListeners )
{
closingListeners.remove( listener );
}
closingListeners.remove( listener );
}
/**
@ -1210,26 +1204,18 @@ public abstract class ChatRoom extends BackgroundPanel implements ActionListener
*/
private void fireClosingListeners()
{
synchronized ( closingListeners )
for ( final ChatRoomClosingListener listener : new ArrayList<>( closingListeners ) ) // Listener can call #removeClosingListener. Prevent ConcurrentModificationException by using a clone.
{
final Iterator<ChatRoomClosingListener> listeners = closingListeners.iterator();
while ( listeners.hasNext() )
try
{
final ChatRoomClosingListener listener = listeners.next();
try
{
listener.closing();
}
catch ( Exception e )
{
Log.error( "A ChatRoomClosingListener (" + listener + ") threw an exception while processing a 'closing' event.", e );
}
finally
{
listeners.remove();
}
listener.closing();
}
catch ( Exception e )
{
Log.error( "A ChatRoomClosingListener (" + listener + ") threw an exception while processing a 'closing' event.", e );
}
}
closingListeners.clear();
}
/**