[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http BulkUploadUtil.java

[fpunt]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http
In directory 
james.mmbase.org:/tmp/cvs-serv29824/cmsc/utilities/src/java/com/finalist/util/http

Modified Files:
      Tag: b1_4
        BulkUploadUtil.java 
Log Message:
Fixed CMSC-1053


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http
See also: http://www.mmbase.org/jira/browse/CMSC-1053


Index: BulkUploadUtil.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http/BulkUploadUtil.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -b -r1.6.2.1 -r1.6.2.2
--- BulkUploadUtil.java 19 May 2008 09:42:29 -0000      1.6.2.1
+++ BulkUploadUtil.java 25 Aug 2008 14:57:43 -0000      1.6.2.2
@@ -92,9 +92,11 @@
          }
          else {
             Node node = createNode(manager, binary.getOriginalFileName(), 
binary.getInputStream(), binary.getLength());
+            if(node != null) {
             nodes.add(node.getNumber());
          }
       }
+      }
       return nodes;
    }
 
@@ -111,11 +113,15 @@
 
 
    private static Node createNode(NodeManager manager, String fileName, 
InputStream in, long length) {
+          if(length > manager.getField("handle").getMaxLength()) {
+                  return null;
+          }
       Node node = manager.createNode();
       node.setValue("title", fileName);
       node.setValue("filename", fileName);
       node.setInputStreamValue("handle", in, length);
       node.commit();
+      
       return node;
    }
 
@@ -147,7 +153,9 @@
             out.close();
             FileInputStream in = new FileInputStream(tempFile);
             Node node = createNode(manager, entry.getName(), in, 
tempFile.length());
+            if(node != null) {
             nodes.add(node.getNumber());
+            }
             in.close();
             tempFile.delete();
          }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs