[seam-commits] Seam SVN: r7781 - branches/Seam_2_0/src/main/org/jboss/seam/core.
Author: pete.muir(a)jboss.org
Date: 2008-03-31 19:11:38 -0400 (Mon, 31 Mar 2008)
New Revision: 7781
Modified:
branches/Seam_2_0/src/main/org/jboss/seam/core/ConversationPropagation.java
Log:
Backport r7759, JBSEAM-2606, thanks to Jacob Orshalick and backport r780, JBSEAM-2583
Modified: branches/Seam_2_0/src/main/org/jboss/seam/core/ConversationPropagation.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/core/ConversationPropagation.java 2008-03-31
23:02:24 UTC (rev 7780)
+++ branches/Seam_2_0/src/main/org/jboss/seam/core/ConversationPropagation.java 2008-03-31
23:11:38 UTC (rev 7781)
@@ -11,6 +11,7 @@
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
+import org.jboss.seam.navigation.ConversationIdParameter;
import org.jboss.seam.navigation.Page;
import org.jboss.seam.navigation.Pages;
@@ -105,10 +106,30 @@
if ( viewId!=null )
{
Page page = Pages.instance().getPage(viewId);
- conversationId =
page.getConversationIdParameter().getRequestConversationId(parameters);
+
+ if(conversationName != null)
+ {
+ ConversationIdParameter currentConversationIdParameter =
Pages.instance().getConversationIdParameter(conversationName);
+
+ if(currentConversationIdParameter == null)
+ {
+ throw new IllegalStateException("The conversationName specified:
" + conversationName + ", does not exist.");
+ }
+ // Try to restore the conversation from parameters (the user has specified
the exact conversation to restore using f:param)
+ conversationId =
currentConversationIdParameter.getRequestConversationId(parameters);
+ if (conversationId == null)
+ {
+ // Try to restore the conversation from the EL expression on the
conversation definition
+ conversationId = currentConversationIdParameter.getConversationId();
+ }
+ }
+ else
+ {
+ conversationId =
page.getConversationIdParameter().getRequestConversationId(parameters);
+ }
//TODO: how about the parent conversation id?
}
- // TODO handle conversationName
+
}
private void restoreSyntheticConversationId(Map parameters)