[MMBASE CVS] src/org/mmbase/bridge/implementation BasicNodeManager.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/bridge/implementation
In directory james.mmbase.org:/tmp/cvs-serv4440

Modified Files:
        BasicNodeManager.java 
Log Message:
string values are implicitely set to ''


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/implementation


Index: BasicNodeManager.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/implementation/BasicNodeManager.java,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- BasicNodeManager.java       6 Jun 2008 14:38:59 -0000       1.135
+++ BasicNodeManager.java       9 Jun 2008 11:08:00 -0000       1.136
@@ -38,7 +38,7 @@
  * @author Rob Vermeulen
  * @author Pierre van Rooden
  * @author Michiel Meeuwissen
- * @version $Id: BasicNodeManager.java,v 1.135 2008/06/06 14:38:59 michiel Exp 
$
+ * @version $Id: BasicNodeManager.java,v 1.136 2008/06/09 11:08:00 michiel Exp 
$
 
  */
 public class BasicNodeManager extends BasicNode implements NodeManager {
@@ -250,6 +250,7 @@
      * @since MMBase-1.8.6
      */
     protected void setDefaultsWithCloud(MMObjectNode node) {
+        log.debug("Setting default values");
         for (Iterator i = getFields().iterator(); i.hasNext(); ) {
             Field field = (Field) i.next();
             if (field.isVirtual())                         continue;
@@ -257,11 +258,15 @@
             if (field.getName().equals(MMObjectBuilder.FIELD_OWNER))       
continue;
             if (field.getName().equals(MMObjectBuilder.FIELD_OBJECT_TYPE)) 
continue;
 
-            if (node.isNull(field.getName())) {
+            if (node.isNull(field.getName()) || 
"".equals(node.getStringValue(field.getName()))) { // required field are set to 
'', which would destroy the default value...
                 org.mmbase.datatypes.DataType dt = field.getDataType();
                 //log.info("" + field.getName() + " " + dt);
                 Object defaultValue = 
dt.getDefaultValue(getCloud().getLocale(), getCloud(), field);
                 node.setValue(field.getName(), defaultValue);
+            } else {
+                if (log.isDebugEnabled()) {
+                    log.debug("" + field.getName() + " is already non null, 
but " + node.getValue(field.getName()));
+                }
             }
         }
     }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs