svn commit: r1001326 - /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java

[jo...@apache.org]

Author: jonesde
Date: Sat Sep 25 22:20:29 2010
New Revision: 1001326

URL: http://svn.apache.org/viewvc?rev=1001326&view=rev
Log:
Added another BshInterpreter clear to fix the problem where a value set in row-actions was not available to use-when conditions, or any BSH run within that row

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=1001326&r1=1001325&r2=1001326&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Sat Sep 25 22:20:29 2010
@@ -1421,7 +1421,7 @@ public class ModelForm extends ModelWidg
             lowIndex = 0;
             highIndex = ((Integer) context.get("viewSize")).intValue();
         }
-
+        
         if (iter != null) {
             // render item rows
             int itemIndex = -1;
@@ -1447,6 +1447,8 @@ public class ModelForm extends ModelWidg
                     localContext.push(itemMap);
                 }
 
+                // reset/remove the BshInterpreter now as well as later because chances are there is an interpreter at this level of the stack too
+                this.resetBshInterpreter(localContext);
                 localContext.push();
                 localContext.put("previousItem", previousItem);
                 previousItem = FastMap.newInstance();