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

[Michiel Meeuwissen]

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

Modified Files:
        MMObjectNode.java 
Log Message:
MMB-1628?


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


Index: MMObjectNode.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/MMObjectNode.java,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -b -r1.215 -r1.216
--- MMObjectNode.java   25 Mar 2008 21:00:25 -0000      1.215
+++ MMObjectNode.java   7 Apr 2008 11:37:02 -0000       1.216
@@ -38,7 +38,7 @@
  * @author Eduard Witteveen
  * @author Michiel Meeuwissen
  * @author Ernst Bunders
- * @version $Id: MMObjectNode.java,v 1.215 2008/03/25 21:00:25 nklasens Exp $
+ * @version $Id: MMObjectNode.java,v 1.216 2008/04/07 11:37:02 michiel Exp $
  */
 
 public class MMObjectNode implements org.mmbase.util.SizeMeasurable, 
java.io.Serializable  {
@@ -894,8 +894,8 @@
         if (VALUE_SHORTED.equals(value)) {
             BlobCache blobs = parent.getBlobCache(fieldName);
             String key = blobs.getKey(getNumber(), fieldName);
-            byte[] v = (byte[]) blobs.get(key);
-            if (v == null) {
+           byte[] v;
+            if (! blobs.containsKey(key)) {
                 if (getSize(fieldName) < blobs.getMaxEntrySize()) {
                     v = parent.mmb.getStorageManager().getBinaryValue(this, 
parent.getField(fieldName));
                     if (log.isDebugEnabled()) {
@@ -907,9 +907,10 @@
                     return 
parent.mmb.getStorageManager().getInputStreamValue(this, 
parent.getField(fieldName));
                 }
             } else {
+                v = (byte[]) blobs.get(key);
                 log.debug("Found in blob cache " + fieldName);
             }
-            return new ByteArrayInputStream(v);
+            return v == null ? null : new ByteArrayInputStream(v);
         } else {
             if (value instanceof byte[]) {
                 return new ByteArrayInputStream((byte[]) value);
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs