Hi David, is it ok if I backport this also to the 12.04 branch?
Jacopo On Mar 19, 2013, at 6:48 PM, [email protected] wrote: > Author: jonesde > Date: Tue Mar 19 17:48:28 2013 > New Revision: 1458429 > > URL: http://svn.apache.org/r1458429 > Log: > Fixed issue with deserialization from XML of an entity value with null fields > > Modified: > ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java > > Modified: > ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java > URL: > http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=1458429&r1=1458428&r2=1458429&view=diff > ============================================================================== > --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java > (original) > +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java > Tue Mar 19 17:48:28 2013 > @@ -2377,7 +2377,13 @@ public class GenericDelegator implements > String attr = element.getAttribute(name); > > if (UtilValidate.isNotEmpty(attr)) { > - value.setString(name, attr); > + // GenericEntity.makeXmlElement() sets null values to > GenericEntity.NULL_FIELD.toString(), so look for > + // that and treat it as null > + if (GenericEntity.NULL_FIELD.toString().equals(attr)) { > + value.set(name, null); > + } else { > + value.setString(name, attr); > + } > } else { > // if no attribute try a subelement > Element subElement = UtilXml.firstChildElement(element, name); > >
