From 5bfb99a72beab56849c7f94f22afb5f089f5c9be Mon Sep 17 00:00:00 2001 From: Micha Kiener Date: Thu, 24 Mar 2011 11:35:45 +0000 Subject: [PATCH] SPR-6423, fixing bug while adding new nested conversation --- .../conversation/manager/ConversationManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationManagerImpl.java b/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationManagerImpl.java index ad8a2eb55d..e4a43d8b38 100644 --- a/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationManagerImpl.java +++ b/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationManagerImpl.java @@ -246,7 +246,7 @@ public class ConversationManagerImpl implements ConversationManager { // nest the new conversation to the current one, if available and // set the current one as the parent of the new one if (joinMode.mustBeNested()) { - newConversation.setParentConversation(currentConversation, joinMode.mustBeIsolated()); + currentConversation.addChildConversation(newConversation, joinMode.mustBeIsolated()); currentConversation.deactivated(joinMode.mustBeIsolated() ? ConversationDeactivationType.NEW_ISOLATED : ConversationDeactivationType.NEW_NESTED, newConversation); } -- GitLab