Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv4911
Modified Files:
Tag: MMBase-1_8
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.193.2.9
retrieving revision 1.193.2.10
diff -u -b -r1.193.2.9 -r1.193.2.10
--- MMObjectNode.java 19 Mar 2008 09:49:07 -0000 1.193.2.9
+++ MMObjectNode.java 7 Apr 2008 11:29:18 -0000 1.193.2.10
@@ -38,7 +38,7 @@
* @author Eduard Witteveen
* @author Michiel Meeuwissen
* @author Ernst Bunders
- * @version $Id: MMObjectNode.java,v 1.193.2.9 2008/03/19 09:49:07 michiel Exp
$
+ * @version $Id: MMObjectNode.java,v 1.193.2.10 2008/04/07 11:29:18 michiel
Exp $
*/
public class MMObjectNode implements org.mmbase.util.SizeMeasurable,
java.io.Serializable {
@@ -973,8 +973,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()) {
@@ -986,9 +986,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);
@@ -1312,7 +1313,6 @@
log.error("MMObjectNode -> can't get parent");
return "problem";
}
-
//return "" + getFunctionValue("gui", null);
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
