Update of /var/cvs/src/org/mmbase/storage/implementation/database
In directory
james.mmbase.org:/tmp/cvs-serv4946/src/org/mmbase/storage/implementation/database
Modified Files:
DatabaseStorageManager.java
Log Message:
getBytes should start at 1, not 0. Also adapted some logging.
See also:
http://cvs.mmbase.org/viewcvs/src/org/mmbase/storage/implementation/database
Index: DatabaseStorageManager.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/storage/implementation/database/DatabaseStorageManager.java,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -b -r1.192 -r1.193
--- DatabaseStorageManager.java 11 Apr 2008 15:13:38 -0000 1.192
+++ DatabaseStorageManager.java 6 May 2008 15:27:40 -0000 1.193
@@ -32,7 +32,7 @@
*
* @author Pierre van Rooden
* @since MMBase-1.7
- * @version $Id: DatabaseStorageManager.java,v 1.192 2008/04/11 15:13:38
nklasens Exp $
+ * @version $Id: DatabaseStorageManager.java,v 1.193 2008/05/06 15:27:40
pierre Exp $
*/
public class DatabaseStorageManager implements StorageManager {
@@ -2922,15 +2922,18 @@
if (foundColumn) {
Blob b =
getBlobFromDatabase(node, field, false);
- byte[] bytes = b.getBytes(0L,
(int) b.length());
+ int length = (int) b.length();
+ if (length > 0) {
+ byte[] bytes =
b.getBytes(1L, length);
node.setValue(fieldName,
bytes);
storeBinaryAsFile(node, field);
node.storeValue(fieldName,
MMObjectNode.VALUE_SHORTED); // remove to avoid filling node-cache with lots of
handles and cause out-of-memory
// node.commit(); no need,
because we only changed blob (so no database updates are done)
result++;
+ log.service("( " + result +
") Found " + length + " bytes for " + node.getNumber() + " in database while
configured to be on disk. Stored to " + storeFile);
+ }
fromDatabase++;
- log.service("( " + result + ")
Found bytes in database while configured to be on disk. Stored to " +
storeFile);
}
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
