SPR-6423, fixing isParent bug in conversation object

Micha Kiener · Micha Kiener · commit 19daba5bdac4 · 2011-03-24T11:35:16.000Z
diff --git a/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationImpl.java b/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationImpl.java
@@ -361,8 +361,20 @@ public boolean isNested() {
      * @see org.springframework.conversation.manager.MutableConversation#isParent()
      */
     public boolean isParent() {
-        return (children != null && children.size() > 0);
-    }
+		if (children == null || children.size() == 0) {
+			return false;
+		}
+
+		// step through the list of children and search for at least one active child conversation in order to
+		// make this an active parent
+		for (MutableConversation conversation : children) {
+			if (!conversation.isEnded()) {
+				return true;
+			}
+		}
+
+		return false;
+	}
 
     /**
      * @see org.springframework.conversation.Conversation#isTemporary()
