svn commit: r1226070 - in /ofbiz/branches/release4.0: ./ framework/entity/src/org/ofbiz/entity/GenericEntity.java

Author: jleroux
Date: Sat Dec 31 11:40:06 2011
New Revision: 1226070

URL: http://svn.apache.org/viewvc?rev=1226070&view=rev
Log:
"Applied fix from trunk for revision: 1226065"
------------------------------------------------------------------------
r1226065 | jleroux | 2011-12-31 12:37:23 +0100 (sam., 31 déc. 2011) | 3 lines

This completes "Null values are not synchronized in http mode" https://issues.apache.org/jira/browse/OFBIZ-4602

And I better understand Patrick's answer to the issue now...
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release4.0/   (props changed)
    ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/GenericEntity.java

Propchange: ofbiz/branches/release4.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 31 11:40:06 2011
@@ -1 +1 @@
-/ofbiz/trunk:536399,539836-539837,618970,627900,629279,674173,676162,676227,676246,679704,690644,705862,706035,706055,706067,706692,721839,721887,728935,737443,738870,741491,808792,814731,827730,890245,942884,943168,954956,958343,958514,965916,967098,980935,981123,1226055
+/ofbiz/trunk:536399,539836-539837,618970,627900,629279,674173,676162,676227,676246,679704,690644,705862,706035,706055,706067,706692,721839,721887,728935,737443,738870,741491,808792,814731,827730,890245,942884,943168,954956,958343,958514,965916,967098,980935,981123,1226055,1226065

Modified: ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/GenericEntity.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/GenericEntity.java?rev=1226070&r1=1226069&r2=1226070&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/GenericEntity.java (original)
+++ ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/GenericEntity.java Sat Dec 31 11:40:06 2011
@@ -420,7 +420,7 @@ public class GenericEntity extends Obser
         }
         
         boolean isNullString = false;
-        if ("null".equals(value)) {
+        if ("null".equals(value) || "[null-field]".equals(value)) {
             // count this as a null too, but only for numbers and stuff, not for Strings
             isNullString = true;
         }