svn commit: r1341094 - in /ofbiz/trunk/framework: minilang/src/org/ofbiz/minilang/SimpleMethod.java widget/src/org/ofbiz/widget/screen/ModelScreen.java

[do...@apache.org]

Author: doogie
Date: Mon May 21 16:22:57 2012
New Revision: 1341094

URL: http://svn.apache.org/viewvc?rev=1341094&view=rev
Log:
FIX: Remove "null" from the context, so that the real 'null' token can
be used.  What was occuring previously, was that any use of "null" would
actually end up using GenericEntity.NullField, which has a string value
of "[null-field]".

Modified:
    ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java?rev=1341094&r1=1341093&r2=1341094&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java Mon May 21 16:22:57 2012
@@ -400,8 +400,6 @@ public final class SimpleMethod extends 
         if (userLogin != null) {
             methodContext.putEnv(getUserLoginEnvName(), userLogin);
         }
-        // always put the null field object in as "null"
-        methodContext.putEnv("null", GenericEntity.NULL_FIELD);
         methodContext.putEnv("nullField", GenericEntity.NULL_FIELD);
         methodContext.putEnv(getDelegatorEnvName(), methodContext.getDelegator());
         methodContext.putEnv(getSecurityEnvName(), methodContext.getSecurity());

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java?rev=1341094&r1=1341093&r2=1341094&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java Mon May 21 16:22:57 2012
@@ -348,8 +348,6 @@ public class ModelScreen extends ModelWi
      *   use the same screen definitions for many types of screen UIs
      */
     public void renderScreenString(Appendable writer, Map<String, Object> context, ScreenStringRenderer screenStringRenderer) throws ScreenRenderException {
-        // make sure the "null" object is in there for entity ops
-        context.put("null", GenericEntity.NULL_FIELD);
         // make sure the "nullField" object is in there for entity ops
         context.put("nullField", GenericEntity.NULL_FIELD);