[OFBiz] SVN: r4939 - trunk/framework/entity/src/org/ofbiz/entity

[jonesde at svn.ofbiz.org]

Author: jonesde
Date: 2005-05-02 17:26:23 -0500 (Mon, 02 May 2005)
New Revision: 4939

Modified:
   trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java
Log:
Changed setString so that the value null is considered a null for numbers, dates, etc, but not for strings

Modified: trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java
===================================================================
--- trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java	2005-05-02 21:57:26 UTC (rev 4938)
+++ trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java	2005-05-02 22:26:23 UTC (rev 4939)
@@ -411,6 +411,12 @@
             return;
         }
         
+        boolean isNullString = false;
+        if ("null".equals(value)) {
+            // count this as a null too, but only for numbers and stuff, not for Strings
+            isNullString = true;
+        }
+        
         ModelField field = getModelEntity().getField(name);
         if (field == null) set(name, value); // this will get an error in the set() method...
 
@@ -430,35 +436,35 @@
                 break;
 
             case 2:
-                set(name, java.sql.Timestamp.valueOf(value));
+                set(name, isNullString ? null : java.sql.Timestamp.valueOf(value));
                 break;
 
             case 3:
-                set(name, java.sql.Time.valueOf(value));
+                set(name, isNullString ? null : java.sql.Time.valueOf(value));
                 break;
 
             case 4:
-                set(name, java.sql.Date.valueOf(value));
+                set(name, isNullString ? null : java.sql.Date.valueOf(value));
                 break;
 
             case 5:
-                set(name, Integer.valueOf(value));
+                set(name, isNullString ? null : Integer.valueOf(value));
                 break;
 
             case 6:
-                set(name, Long.valueOf(value));
+                set(name, isNullString ? null : Long.valueOf(value));
                 break;
 
             case 7:
-                set(name, Float.valueOf(value));
+                set(name, isNullString ? null : Float.valueOf(value));
                 break;
 
             case 8:
-                set(name, Double.valueOf(value));
+                set(name, isNullString ? null : Double.valueOf(value));
                 break;
 
             case 9:
-                set(name, Boolean.valueOf(value));
+                set(name, isNullString ? null : Boolean.valueOf(value));
                 break;
 
             case 10: