You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2007/02/23 00:04:08 UTC
svn commit: r510701 - in
/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion:
conversation/Conversation.java conversation/CurrentConversationAdvice.java
listeners/FusionPhaseListener.java
Author: imario
Date: Thu Feb 22 15:04:07 2007
New Revision: 510701
URL: http://svn.apache.org/viewvc?view=rev&rev=510701
Log:
avoid stack overflow, fixed ending of conversation, "disabled" FusionPhaseListener for now, needs some more thoughts
Modified:
myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/Conversation.java
myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/CurrentConversationAdvice.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/Conversation.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/Conversation.java?view=diff&rev=510701&r1=510700&r2=510701
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/Conversation.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/Conversation.java Thu Feb 22 15:04:07 2007
@@ -110,8 +110,6 @@
*/
public String getName()
{
- checkValid();
-
return name;
}
Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/CurrentConversationAdvice.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/CurrentConversationAdvice.java?view=diff&rev=510701&r1=510700&r2=510701
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/CurrentConversationAdvice.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/CurrentConversationAdvice.java Thu Feb 22 15:04:07 2007
@@ -48,7 +48,7 @@
if (conversation.isQueueInvalid())
{
- conversation.destroy();
+ ConversationManager.getInstance().endConversation(conversation.getName());
}
Conversation.setCurrentInstance(previous);
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=510701&r1=510700&r2=510701
==============================================================================
--- 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:04:07 2007
@@ -41,7 +41,8 @@
{
if (PhaseId.RESTORE_VIEW.equals(event.getPhaseId()))
{
- AUTOMATIC_CONVERSATION_CREATION.set(Boolean.FALSE);
+ // AUTOMATIC_CONVERSATION_CREATION.set(Boolean.FALSE);
+ AUTOMATIC_CONVERSATION_CREATION.set(Boolean.TRUE);
}
else if (PhaseId.RENDER_RESPONSE.equals(event.getPhaseId()))
{