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 2006/11/13 18:32:42 UTC
svn commit: r474407 -
/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/conversation/UIEnsureConversation.java
Author: imario
Date: Mon Nov 13 09:32:40 2006
New Revision: 474407
URL: http://svn.apache.org/viewvc?view=rev&rev=474407
Log:
do not print message in case the user issued not navigation
Modified:
myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/conversation/UIEnsureConversation.java
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/conversation/UIEnsureConversation.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/conversation/UIEnsureConversation.java?view=diff&rev=474407&r1=474406&r2=474407
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/conversation/UIEnsureConversation.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/conversation/UIEnsureConversation.java Mon Nov 13 09:32:40 2006
@@ -84,8 +84,6 @@
ConversationManager conversationManager = ConversationManager.getInstance();
if (!conversationManager.hasConversation(name))
{
- conversationManager.getMessager().setConversationNotActive(context, getName());
-
if (getAction() != null)
{
String actionResult = (String) getAction().invoke(context, null);
@@ -94,12 +92,15 @@
// no further action, maybe the user started a conversation
return;
}
+ conversationManager.getMessager().setConversationNotActive(context, getName());
// hopefully the user configured the navigation as redirect ...
context.getApplication().getNavigationHandler().handleNavigation(context, null, actionResult);
}
else
{
+ conversationManager.getMessager().setConversationNotActive(context, getName());
+
String actionUrl = context.getApplication().getViewHandler().getActionURL(
context, getRedirectTo());
String encodedActionUrl = context.getExternalContext().encodeActionURL(actionUrl);