[seam-commits] Seam SVN: r8569 - in branches/Seam_2_0_FP/src/main/org/jboss/seam: navigation and 1 other directory.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2008-08-04 10:43:22 -0400 (Mon, 04 Aug 2008)
New Revision: 8569

Modified:
   branches/Seam_2_0_FP/src/main/org/jboss/seam/core/ConversationPropagation.java
   branches/Seam_2_0_FP/src/main/org/jboss/seam/navigation/ELConversationIdParameter.java
Log:
Backport of JBSEAM-3053

Modified: branches/Seam_2_0_FP/src/main/org/jboss/seam/core/ConversationPropagation.java
===================================================================
--- branches/Seam_2_0_FP/src/main/org/jboss/seam/core/ConversationPropagation.java	2008-08-04 14:40:13 UTC (rev 8568)
+++ branches/Seam_2_0_FP/src/main/org/jboss/seam/core/ConversationPropagation.java	2008-08-04 14:43:22 UTC (rev 8569)
@@ -117,11 +117,9 @@
              }
              // 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();
-             }
+
+             // NOTE: If conversationId is still null, don't try to resolve the EL here because we don't yet
+             // have a conversation and therefore things may blow up; resolve EL in getInitialConversationId()
          }
          else
          {

Modified: branches/Seam_2_0_FP/src/main/org/jboss/seam/navigation/ELConversationIdParameter.java
===================================================================
--- branches/Seam_2_0_FP/src/main/org/jboss/seam/navigation/ELConversationIdParameter.java	2008-08-04 14:40:13 UTC (rev 8568)
+++ branches/Seam_2_0_FP/src/main/org/jboss/seam/navigation/ELConversationIdParameter.java	2008-08-04 14:43:22 UTC (rev 8569)
@@ -42,7 +42,7 @@
    public String getInitialConversationId(Map parameters)
    {
       String id = getRequestConversationId(parameters);
-      return id==null ? Id.nextId() : id; //TODO: should we try using the expression?
+      return id == null ? getConversationId() : id;
    }
    
    public String getRequestConversationId(Map parameters)