[MMBASE CVS] src/org/mmbase/module/core MMObjectBuilder.java MMObjectNode.java

[Nico Klasens]

Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv19792/src/org/mmbase/module/core

Modified Files:
        MMObjectBuilder.java MMObjectNode.java 
Log Message:
MMB-1628  Even if using Node#getInputStream the complete blob is readed into 
memory first.


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core
See also: http://www.mmbase.org/jira/browse/MMB-1628


Index: MMObjectBuilder.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/MMObjectBuilder.java,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -b -r1.422 -r1.423
--- MMObjectBuilder.java        25 Mar 2008 21:00:25 -0000      1.422
+++ MMObjectBuilder.java        11 Apr 2008 15:13:37 -0000      1.423
@@ -61,7 +61,7 @@
  * @author Rob van Maris
  * @author Michiel Meeuwissen
  * @author Ernst Bunders
- * @version $Id: MMObjectBuilder.java,v 1.422 2008/03/25 21:00:25 nklasens Exp 
$
+ * @version $Id: MMObjectBuilder.java,v 1.423 2008/04/11 15:13:37 nklasens Exp 
$
  */
 public class MMObjectBuilder extends MMTable implements NodeEventListener, 
RelationEventListener {
 
@@ -2934,6 +2934,15 @@
         }
     }
 
-}
-
+    protected boolean isNull(String fieldName, MMObjectNode node) {
+        if (node.getNumber() < 0) return true; // capture calls from temporary 
nodes
+        try {
+            return mmb.getStorageManager().isNull(node, getField(fieldName));
+        } catch (StorageException se) {
+            log.error(se.getMessage());
+            log.error(Logging.stackTrace(se));
+            return true;
+        }
+    }
 
+}
\ No newline at end of file


Index: MMObjectNode.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/MMObjectNode.java,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -b -r1.216 -r1.217
--- MMObjectNode.java   7 Apr 2008 11:37:02 -0000       1.216
+++ MMObjectNode.java   11 Apr 2008 15:13:38 -0000      1.217
@@ -38,7 +38,7 @@
  * @author Eduard Witteveen
  * @author Michiel Meeuwissen
  * @author Ernst Bunders
- * @version $Id: MMObjectNode.java,v 1.216 2008/04/07 11:37:02 michiel Exp $
+ * @version $Id: MMObjectNode.java,v 1.217 2008/04/11 15:13:38 nklasens Exp $
  */
 
 public class MMObjectNode implements org.mmbase.util.SizeMeasurable, 
java.io.Serializable  {
@@ -675,6 +675,11 @@
             if (field != null && field.getType() == Field.TYPE_NODE) {
                 return getIntValue(fieldName) <= -1;
             }
+            Object value = values.get(fieldName);
+            if (VALUE_SHORTED.equals(value)) {
+                // value is not loaded from the database. We have to check the 
database to be sure.
+                return parent.isNull(fieldName, this);
+            }
             return values.get(fieldName) == null;
         } else {
             return true;
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs