Author: michiel
Date: 2009-05-04 13:06:40 +0200 (Mon, 04 May 2009)
New Revision: 34923

Modified:
   mmbase/branches/MMBase-1_8/src/org/mmbase/module/core/MMObjectNode.java
Log:
Rolled back removal of 2009-04-07, because it breaks upload of blobs in 
editwizards. In trunk it is fixed differently (See mmb-1810)

Modified: 
mmbase/branches/MMBase-1_8/src/org/mmbase/module/core/MMObjectNode.java
===================================================================
--- mmbase/branches/MMBase-1_8/src/org/mmbase/module/core/MMObjectNode.java     
2009-05-04 10:20:11 UTC (rev 34922)
+++ mmbase/branches/MMBase-1_8/src/org/mmbase/module/core/MMObjectNode.java     
2009-05-04 11:06:40 UTC (rev 34923)
@@ -819,11 +819,15 @@
         if (value == null) {
             if (!checkFieldExistance(fieldName)) return null;
         }
-//
-//        if (value instanceof InputStream) {
-//            value = useInputStream(fieldName, (InputStream) value);
-//        }
 
+
+        // This may cause buffering of the entire blob (see also MMB-1810, it 
is fixed in trunk).
+        // Bug if this does not happen, than e.g. binary upload do not work 
any more correctly in the
+        // editiwizards, because the 'size' fields remain unfilled.
+        if (value instanceof InputStream) {
+            value = useInputStream(fieldName, (InputStream) value);
+        }
+
         // return the found object
         return value;
     }

_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to