svn commit: r1673866 - /ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java

[jleroux]

Author: jleroux
Date: Wed Apr 15 16:45:24 2015
New Revision: 1673866

URL: http://svn.apache.org/r1673866
Log:
Fixes https://issues.apache.org/jira/browse/OFBIZ-6254 "Minilang: type="NewMap" 
and type="NewList" for the Set element don't work"

Modified:
    
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java

Modified: 
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java?rev=1673866&r1=1673865&r2=1673866&view=diff
==============================================================================
--- 
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java
 (original)
+++ 
ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java
 Wed Apr 15 16:45:24 2015
@@ -151,7 +151,7 @@ public final class SetOperation extends
         if (ObjectType.isEmpty(newValue) && !this.defaultFse.isEmpty()) {
             newValue = this.defaultFse.expand(methodContext.getEnvMap());
         }
-        if (!setIfNull && newValue == null) {
+        if (!setIfNull && newValue == null && !"NewMap".equals(this.type) && 
"NewList".equals(this.type)) {
             if (Debug.verboseOn())
                 Debug.logVerbose("Field value not found (null) with name [" + 
fromFma + "] and value [" + valueFse + "], and there was not default value, not 
setting field", module);
             return true;