SPR-6419, manager implementation

org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationManagerImpl.java

@@ -132,16 +132,21 @@ public class ConversationManagerImpl implements ConversationManager {
 			ConversationStore store = getConversationStore();
 			store.removeConversation(conversation.getId());
 
-			// if this was a nested conversation and it was the current one,
-			// switch to its parent and set it as the current one
-			if (wasCurrent && conversation.isNested()) {
-				MutableConversation parent = silentlyCastConversation(conversation.getParent());
-				resolver.setCurrentConversationId(parent.getId());
-
-				// invoke listener on the parent because it was made active
-				parent.activated(conversation.isIsolated() ? ConversationActivationType.ISOLATING_ENDED
-						: ConversationActivationType.NESTING_ENDED, conversation);
+			if (wasCurrent) {
+				// if this was a nested conversation and it was the current one,
+				// switch to its parent and set it as the current one
+				if (conversation.isNested()) {
+					MutableConversation parent = silentlyCastConversation(conversation.getParent());
+					resolver.setCurrentConversationId(parent.getId());
+
+					// invoke listener on the parent because it was made active
+					parent.activated(conversation.isIsolated() ? ConversationActivationType.ISOLATING_ENDED
+							: ConversationActivationType.NESTING_ENDED, conversation);
+				} else {
+					resolver.setCurrentConversationId(null);
+				}
 			}
+
 		}
 
 		// invoke ending hook