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/10 07:52:57 UTC

svn commit: r473210 - /myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/conversation/UIEnsureConversation.java

Author: imario
Date: Thu Nov  9 22:52:56 2006
New Revision: 473210

URL: http://svn.apache.org/viewvc?view=rev&rev=473210
Log:
take no action if action method-binding returns null

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=473210&r1=473209&r2=473210
==============================================================================
--- 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 Thu Nov  9 22:52:56 2006
@@ -89,6 +89,11 @@
 			if (getAction() != null)
 			{
 				String actionResult = (String) getAction().invoke(context, null);
+				if (actionResult == null)
+				{
+					// no further action, maybe the user started a conversation
+					return;
+				}
 
 				// hopefully the user configured the navigation as redirect ...
 				context.getApplication().getNavigationHandler().handleNavigation(context, null, actionResult);