Author: dan.j.allen Date: 2008-06-09 13:53:27 -0400 (Mon, 09 Jun 2008) New Revision: 8362 Modified: trunk/src/main/org/jboss/seam/core/ConversationPropagation.java trunk/src/main/org/jboss/seam/navigation/NaturalConversationIdParameter.java Log: JBSEAM-3053 Modified: trunk/src/main/org/jboss/seam/core/ConversationPropagation.java =================================================================== --- trunk/src/main/org/jboss/seam/core/ConversationPropagation.java 2008-06-09 17:52:47 UTC (rev 8361) +++ trunk/src/main/org/jboss/seam/core/ConversationPropagation.java 2008-06-09 17:53:27 UTC (rev 8362) @@ -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: trunk/src/main/org/jboss/seam/navigation/NaturalConversationIdParameter.java =================================================================== --- trunk/src/main/org/jboss/seam/navigation/NaturalConversationIdParameter.java 2008-06-09 17:52:47 UTC (rev 8361) +++ trunk/src/main/org/jboss/seam/navigation/NaturalConversationIdParameter.java 2008-06-09 17:53:27 UTC (rev 8362) @@ -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)