svn commit: r510709 - in /myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion: conversation/ConversationRequestParameterProvider.java listeners/FusionPhaseListener.java

[im...@apache.org]

Author: imario
Date: Thu Feb 22 15:38:05 2007
New Revision: 510709

URL: http://svn.apache.org/viewvc?view=rev&rev=510709
Log:
ensure we have the conversationContext parameter starting with the first request

Modified:
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/ConversationRequestParameterProvider.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/listeners/FusionPhaseListener.java

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/ConversationRequestParameterProvider.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/ConversationRequestParameterProvider.java?view=diff&rev=510709&r1=510708&r2=510709
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/ConversationRequestParameterProvider.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/ConversationRequestParameterProvider.java Thu Feb 22 15:38:05 2007
@@ -46,16 +46,19 @@
 		{
 			throw new IllegalStateException("can find the conversationManager");
 		}
-		if (!conversationManager.hasConversationContext())
+		
+		Long conversationContextId = conversationManager.getConversationContextId();
+		if (conversationContextId == null)
 		{
 			return null;
 		}
 
-		return Long.toString(conversationManager.getConversationContextId().longValue(), Character.MAX_RADIX);
+		return Long.toString(conversationContextId.longValue(), Character.MAX_RADIX);
 	}
 
 	public String[] getFields()
 	{
+		/*
 		if (UISeparateConversationContext.isInSeparationMode())
 		{
 			return null;
@@ -70,6 +73,7 @@
 		{
 			return null;
 		}
+		*/
 
 		return REQUEST_PARAMETERS;
 	}

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/listeners/FusionPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/listeners/FusionPhaseListener.java?view=diff&rev=510709&r1=510708&r2=510709
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/listeners/FusionPhaseListener.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/listeners/FusionPhaseListener.java Thu Feb 22 15:38:05 2007
@@ -19,6 +19,8 @@
 
 package org.apache.myfaces.fusion.listeners;
 
+import org.apache.myfaces.fusion.conversation.ConversationManager;
+
 import javax.faces.event.PhaseEvent;
 import javax.faces.event.PhaseId;
 import javax.faces.event.PhaseListener;
@@ -41,6 +43,9 @@
 	{
 		if (PhaseId.RESTORE_VIEW.equals(event.getPhaseId()))
 		{
+			// ensure correct setup of system
+			ConversationManager.getInstance(event.getFacesContext());
+
 			// AUTOMATIC_CONVERSATION_CREATION.set(Boolean.FALSE);
 			AUTOMATIC_CONVERSATION_CREATION.set(Boolean.TRUE);
 		}