SPR-6419, manager implementation

Micha Kiener · Micha Kiener · commit 6e466f4061cf · 2010-01-06T17:42:29.000Z
diff --git a/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationManager.java b/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationManager.java
@@ -177,6 +177,8 @@ <T extends ConversationType> Conversation beginConversation(JoinMode joinMode, T
 	 * @param endingType the type qualifying on how this conversation is to be
 	 * ended (only passed on to any listeners, does not have an impact on the
 	 * conversation manager)
+	 * @throws IllegalStateException if the given conversation has a nested
+	 * conversation which is not ended which is an illegal condition
 	 */
 	void endConversation(Conversation conversation, ConversationEndingType endingType);
 
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
@@ -116,12 +116,16 @@ public Conversation endCurrentConversation(ConversationEndingType endingType) {
 	 * org.springframework.conversation.ConversationEndingType)
 	 */
 	public void endConversation(Conversation conversation, ConversationEndingType endingType) {
+		MutableConversation c = silentlyCastConversation(conversation);
+		if (c.isParent()) {
+			throw new IllegalStateException(
+					"Illegal attempt to end a conversation, still having a nested, active conversation.");
+		}
+
 		ConversationResolver resolver = getConversationResolver();
 		String currentId = resolver.getCurrentConversationId();
 		boolean wasCurrent = (currentId != null && currentId.equals(conversation.getId()));
 
-		MutableConversation c = silentlyCastConversation(conversation);
-
 		// let the conversation object end (this will invoke any listeners too,
 		// if the conversation was finally ended)
 		c.internallyEndConversation(endingType);
@@ -146,7 +150,6 @@ public void endConversation(Conversation conversation, ConversationEndingType en
 					resolver.setCurrentConversationId(null);
 				}
 			}
-
 		}
 
 		// invoke ending hook
