Author: rahul
Date: Fri Dec  1 11:52:06 2006
New Revision: 481357

URL: http://svn.apache.org/viewvc?view=rev&rev=481357
Log:
Do not recreate view on null outcome.
Reported by: Mario Buonopane, SHALE-341
Investigation and patch by: Gary VanMatre and Craig McClanahan

Modified:
    
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java

Modified: 
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java
URL: 
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java?view=diff&rev=481357&r1=481356&r2=481357
==============================================================================
--- 
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java
 (original)
+++ 
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java
 Fri Dec  1 11:52:06 2006
@@ -224,6 +224,13 @@
     /** [EMAIL PROTECTED] */
     public void advance(FacesContext context, String outcome) {
 
+        // If the incoming outcome is null, we want to stay in the same
+        // (view) state *without* recreating it, which would destroy
+        // any useful information that components might have stored
+        if (outcome == null) {
+            return;
+        }
+
         SCXMLExecutor dialogExecutor = getExecutor(context);
         ((ShaleDialogELEvaluator) dialogExecutor.getEvaluator()).
                     setFacesContext(context);


Reply via email to