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

SPR-6416, reshaping removal of hierarchical conversations and adding repository test

Browse Source
This commit is contained in:
Micha Kiener
2011-04-12 14:53:09 +00:00
parent 6e03b4dd64
commit 58b779355b
3 changed files with 197 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
org.springframework.context/src/main/java/org/springframework/conversation/manager/AbstractConversationRepository.java
View File

@@ -16,8 +16,6 @@
package org.springframework.conversation.manager;
import org.springframework.conversation.Conversation;
/**
* An abstract implementation for a conversation repository. Its implementation is based on the
* {@link org.springframework.conversation.manager.DefaultConversation} and manages its initial timeout and provides
@@ -89,11 +87,16 @@ public abstract class AbstractConversationRepository implements ConversationRepo
* @param conversation the conversation to be removed, including its children, if any
*/
protected final void removeConversation(MutableConversation conversation) {
for (Conversation child : conversation.getChildren()) {
// remove the child from its parent and recursively invoke this method to remove the children of the
// current conversation
conversation.removeChildConversation((MutableConversation)child);
removeConversation((MutableConversation)child);
// as recursively removing children will decrease the children list, always pick out
// the first child to be removed next
while (conversation.getChildren().size() > 0) {
removeConversation((MutableConversation)conversation.getChildren().get(0));
}
// remove the conversation from its parent, if any
MutableConversation parentConversation = (MutableConversation) conversation.getParent();
if (parentConversation != null) {
parentConversation.removeChildConversation(conversation);
}
// end the conversation (will internally clear the attributes, invoke destruction callbacks, if any, and
@@ -102,7 +105,7 @@ public abstract class AbstractConversationRepository implements ConversationRepo
conversation.invalidate();
// finally, remove the single object from the repository
removeSingleConversationObject((MutableConversation)conversation);
removeSingleConversationObject((MutableConversation) conversation);
}
/**

9
org.springframework.context/src/main/java/org/springframework/conversation/manager/DefaultConversation.java
View File

@@ -176,13 +176,12 @@ public class DefaultConversation implements MutableConversation, Serializable {
children = null;
}
}
// remove the parent conversation from the child relationship
((DefaultConversation)conversation).removeParent();
}
protected void removeFromParent() {
if (parent != null) {
parent.removeChildConversation(this);
}
protected void removeParent() {
parent = null;
}