SPR-6423, conversation object

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

@@ -172,9 +172,9 @@ public class ConversationImpl extends DestructionAwareAttributeMap implements Mu
 	}
 
 	/**
-	 * @see org.springframework.conversation.manager.MutableConversation#endConversation(org.springframework.conversation.ConversationEndingType)
+	 * @see org.springframework.conversation.manager.MutableConversation#internallyEndConversation(org.springframework.conversation.ConversationEndingType)
 	 */
-	public void endConversation(ConversationEndingType endingType) {
+	public void internallyEndConversation(ConversationEndingType endingType) {
 		// check, if this conversation was joined before and do not end it if so
 		if (joinCount > 0) {
 			joinCount--;

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

@@ -107,7 +107,7 @@ public interface MutableConversation extends Conversation {
 	 * ended (only passed on to any listeners, does not have an impact on the
 	 * conversation manager)
 	 */
-	void endConversation(ConversationEndingType endingType);
+	void internallyEndConversation(ConversationEndingType endingType);
 
 	/**
 	 * This method is a convenience method to