Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv29894
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.8
retrieving revision 1.193.2.9
diff -u -b -r1.193.2.8 -r1.193.2.9
--- MMObjectNode.java 19 Nov 2007 15:38:39 -0000 1.193.2.8
+++ MMObjectNode.java 19 Mar 2008 09:49:07 -0000 1.193.2.9
@@ -38,7 +38,7 @@
* @author Eduard Witteveen
* @author Michiel Meeuwissen
* @author Ernst Bunders
- * @version $Id: MMObjectNode.java,v 1.193.2.8 2007/11/19 15:38:39 michiel Exp
$
+ * @version $Id: MMObjectNode.java,v 1.193.2.9 2008/03/19 09:49:07 michiel Exp
$
*/
public class MMObjectNode implements org.mmbase.util.SizeMeasurable,
java.io.Serializable {
@@ -746,17 +746,14 @@
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.
- value = getValue(fieldName);
- }
- return value == null;
+ return values.get(fieldName) == null;
} else {
return true;
}
}
+
+
/**
* Get a value of a certain field.
* @performance do not store byte values directly in node (?)
@@ -785,9 +782,11 @@
default:
throw new UnsupportedOperationException("Found shorted
value for type " + type);
}
+ if (getSize(fieldName) < blobs.getMaxEntrySize()) {
blobs.put(key, value);
}
}
+ }
// if we have an XML-dbtype field, we always have to return a Document
(or null).
// note that if the value is null we store it as a null value
@@ -952,7 +951,7 @@
public InputStream getInputStreamValue(String fieldName) {
- Object value = getValue(fieldName);
+ Object value = values.get(fieldName); // don't use getValue here,
it'll introduce MMB-1628
if (value == null) {
checkFieldExistance(fieldName);
log.debug("NULL on " + fieldName + " " + this, new Exception());
@@ -1313,6 +1312,8 @@
log.error("MMObjectNode -> can't get parent");
return "problem";
}
+
+ //return "" + getFunctionValue("gui", null);
}
/**
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
