SPR-6423, fixing bug while adding new nested conversation

Micha Kiener · Micha Kiener · commit 5bfb99a72bea · 2011-03-24T11:35:45.000Z
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
@@ -246,7 +246,7 @@ public Conversation beginConversation(boolean temporary, JoinMode joinMode) {
 			// 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);
 			}

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ public Conversation beginConversation(boolean temporary, JoinMode joinMode) {`
`246`	`246`	`// nest the new conversation to the current one, if available and`
`247`	`247`	`// set the current one as the parent of the new one`
`248`	`248`	`if (joinMode.mustBeNested()) {`
`249`		`- newConversation.setParentConversation(currentConversation, joinMode.mustBeIsolated());`
	`249`	`+ currentConversation.addChildConversation(newConversation, joinMode.mustBeIsolated());`
`250`	`250`	`currentConversation.deactivated(joinMode.mustBeIsolated() ? ConversationDeactivationType.NEW_ISOLATED`
`251`	`251`	`: ConversationDeactivationType.NEW_NESTED, newConversation);`
`252`	`252`	`}`