svn commit: r1673863 - /ofbiz/branches/release14.12/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java

[jleroux]

Author: jleroux
Date: Wed Apr 15 16:43:52 2015
New Revision: 1673863

URL: http://svn.apache.org/r1673863
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/release14.12/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java

Modified: 
ofbiz/branches/release14.12/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java?rev=1673863&r1=1673862&r2=1673863&view=diff
==============================================================================
--- 
ofbiz/branches/release14.12/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java
 (original)
+++ 
ofbiz/branches/release14.12/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java
 Wed Apr 15 16:43:52 2015
@@ -155,7 +155,7 @@ public final class SetOperation extends
             newValue = this.defaultFse.expand(methodContext.getEnvMap());
             isConstant = true;
         }
-        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;