Update of /var/cvs/src/org/mmbase/storage/implementation/database
In directory
james.mmbase.org:/tmp/cvs-serv19966/src/org/mmbase/storage/implementation/database
Modified Files:
DatabaseStorageManager.java
Log Message:
MMB-1746 DatabaseStorageManager.isNull should use checkStoreFieldAsFile(()
See also:
http://cvs.mmbase.org/viewcvs/src/org/mmbase/storage/implementation/database
See also: http://www.mmbase.org/jira/browse/MMB-1746
Index: DatabaseStorageManager.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/storage/implementation/database/DatabaseStorageManager.java,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -b -r1.203 -r1.204
--- DatabaseStorageManager.java 1 Dec 2008 17:36:02 -0000 1.203
+++ DatabaseStorageManager.java 4 Dec 2008 11:23:20 -0000 1.204
@@ -33,7 +33,7 @@
*
* @author Pierre van Rooden
* @since MMBase-1.7
- * @version $Id: DatabaseStorageManager.java,v 1.203 2008/12/01 17:36:02
michiel Exp $
+ * @version $Id: DatabaseStorageManager.java,v 1.204 2008/12/04 11:23:20
nklasens Exp $
*/
public class DatabaseStorageManager implements StorageManager {
@@ -84,7 +84,7 @@
protected static Cache<Integer, Integer> typeCache;
static {
- typeCache = new Cache(OBJ2TYPE_MAX_SIZE) {
+ typeCache = new Cache<Integer, Integer>(OBJ2TYPE_MAX_SIZE) {
public String getName() { return "TypeCache"; }
public String getDescription() { return "Cache for node types";}
};
@@ -3161,7 +3161,7 @@
dbtype = field.getType();
}
- if (dbtype == Field.TYPE_BINARY &&
factory.hasOption(Attributes.STORES_BINARY_AS_FILE)) {
+ if (dbtype == Field.TYPE_BINARY &&
checkStoreFieldAsFile(field.getParent())) {
String fieldName = field.getName();
File binaryFile = checkFile(getBinaryFile(node, fieldName), node,
field);
return binaryFile == null;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
