Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use thread-safe list to store conversations

Browse Source 
While the methods manipulating or accessing the list are synchronized,
the ConversationContainer class is also subject to serialization.

Issue: SWF-1668
This commit is contained in:
Rossen Stoyanchev
2015-08-19 18:17:53 -04:00
parent f4d07d8826
commit ee58d02cbf
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-webflow/src/main/java/org/springframework/webflow/conversation/impl/ConversationContainer.java
View File

@@ -19,6 +19,7 @@ import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@@ -37,6 +38,7 @@ import org.springframework.webflow.conversation.NoSuchConversationException;
* {@link SessionBindingConversationManager}. * {@link SessionBindingConversationManager}.
* *
* @author Erwin Vervaet * @author Erwin Vervaet
* @author Rossen Stoyanchev
*/ */
public class ConversationContainer implements Serializable { public class ConversationContainer implements Serializable {
@@ -63,7 +65,7 @@ public class ConversationContainer implements Serializable {
public ConversationContainer(int maxConversations, String sessionKey) { public ConversationContainer(int maxConversations, String sessionKey) {
this.maxConversations = maxConversations; this.maxConversations = maxConversations;
this.sessionKey = sessionKey; this.sessionKey = sessionKey;
this.conversations = new ArrayList<ContainedConversation>(); this.conversations = new CopyOnWriteArrayList<ContainedConversation>();
} }
/** /**
@@ -135,7 +137,7 @@ public class ConversationContainer implements Serializable {
for (Iterator<ContainedConversation> it = conversations.iterator(); it.hasNext();) { for (Iterator<ContainedConversation> it = conversations.iterator(); it.hasNext();) {
ContainedConversation conversation = it.next(); ContainedConversation conversation = it.next();
if (conversation.getId().equals(id)) { if (conversation.getId().equals(id)) {
it.remove(); conversations.remove(conversation);
break; break;
} }
} }