[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-serv24059

Modified Files:
        MMObjectNode.java 
Log Message:
constructor of SerializableInputStream wants size too now


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core


Index: MMObjectNode.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/MMObjectNode.java,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -b -r1.231 -r1.232
--- MMObjectNode.java   14 Apr 2009 13:14:43 -0000      1.231
+++ MMObjectNode.java   16 Apr 2009 13:48:09 -0000      1.232
@@ -38,7 +38,7 @@
  * @author Eduard Witteveen
  * @author Michiel Meeuwissen
  * @author Ernst Bunders
- * @version $Id: MMObjectNode.java,v 1.231 2009/04/14 13:14:43 michiel Exp $
+ * @version $Id: MMObjectNode.java,v 1.232 2009/04/16 13:48:09 michiel Exp $
  */
 
 public class MMObjectNode implements org.mmbase.util.SizeMeasurable, 
java.io.Serializable, org.mmbase.util.PublicCloneable<MMObjectNode> { // 
Comparable<MMObjectNode>  {
@@ -493,8 +493,9 @@
             // This is just a hack to make app1 import/export working, 
withough exposing the values map.
             values.remove(fieldName);
         }
-        if (fieldValue != null && (fieldValue instanceof InputStream)) {
-            fieldValue = new SerializableInputStream((InputStream) fieldValue);
+        if (fieldValue != null && (fieldValue instanceof InputStream && (! 
(fieldValue instanceof Serializable)))) {
+            log.info("Wrapping " + fieldValue + " for " + fieldName + " 
because ", new Exception());
+            fieldValue = new SerializableInputStream((InputStream) fieldValue, 
getSize(fieldName));
         }
         fieldValue = checkSerializable(fieldName, fieldValue);
         if (checkFieldExistance(fieldName)) {
@@ -610,6 +611,9 @@
         if (fieldValue instanceof byte[]) {
             setSize(fieldName, ((byte[]) fieldValue).length);
             log.debug("Setting length to " + ((byte[]) fieldValue).length);
+        } else if (fieldValue instanceof 
org.apache.commons.fileupload.FileItem) {
+            org.apache.commons.fileupload.FileItem fi = 
(org.apache.commons.fileupload.FileItem) fieldValue;
+            setSize(fieldName, fi.getSize());
         }
 
         // process the changed value (?)
@@ -775,10 +779,12 @@
         if (value == null) {
             if (!checkFieldExistance(fieldName)) return null;
         }
-//
-//        if (value instanceof InputStream) {
-//            value = useInputStream(fieldName, (InputStream) value);
-//        }
+
+        /*
+        if (value instanceof InputStream) {
+            value = useInputStream(fieldName, (InputStream) value);
+        }
+        */
 
         // return the found object
         return value;
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs