[Apache Struts Wiki] Updated: StrutsUpload

[dev]

   Date: 2005-03-10T23:13:36
   Editor: DakotaJack
   Wiki: Apache Struts Wiki
   Page: StrutsUpload
   URL: http://wiki.apache.org/struts/StrutsUpload

   no comment

Change Log:

------------------------------------------------------------------------------
@@ -973,9 +973,7 @@
       }
 
       if(maxFileNumber == UploadConstant.MAX_FILE_NUMBER || numberOfFiles < 
maxFileNumber) {
-        boolean barred = extBarred(uploadFile.getName());
-        if(barred) {
-          barred = false;
+        if(extBarred(uploadFile.getName())) {
           UploadParams uploadParams = new 
UploadParams(uploadFile.getName(),"upload.failure", uploadFile.getSize(), 
uploadFile.getContentType(), "directory", null, null);
           uploadFile.getInputStream().close();
           history.add(uploadParams);
@@ -1022,21 +1020,18 @@
       if(uploadFile.getSize() > maxFileSize) {
         throw new 
UploadException(UploadConstant.UPLOAD_FILE_SIZE_LIMIT_REACHED + " " + 
uploadFile.getName());
       }
-      boolean barred = extBarred(uploadFile.getName());
-      if(barred) {
-        barred = false;
+      if(extBarred(uploadFile.getName())) {
         UploadParams uploadParams = new 
UploadParams(uploadFile.getName(),"upload.failure", uploadFile.getSize(), 
uploadFile.getContentType(), "directory", null, null);
         uploadFile.getInputStream().close();
         history.add(uploadParams);
         notify(uploadParams, uploadFile);
+      } else {
+        UploadStore uploadStore   = UploadStore.getInstance();
+        String      altFileName   = uploadStore.addEntry(uploadFile, 
overwrite, storeLocation,  maxFileNumber);
+        UploadParams uploadParams = new 
UploadParams(uploadFile.getName(),"upload.success", uploadFile.getSize(), 
uploadFile.getContentType(), "zip", storeLocation, altFileName);
+        history.add(uploadParams);
+        notify(uploadParams, uploadFile);
       }
-
-      UploadStore uploadStore   = UploadStore.getInstance();
-      String      altFileName   = uploadStore.addEntry(uploadFile, overwrite, 
storeLocation,  maxFileNumber);
-      UploadParams uploadParams = new 
UploadParams(uploadFile.getName(),"upload.success", uploadFile.getSize(), 
uploadFile.getContentType(), "zip", storeLocation, altFileName);
-
-      history.add(uploadParams);
-      notify(uploadParams, uploadFile);
     }
   }
 
@@ -1047,23 +1042,22 @@
       if(uploadFile.getSize() > maxFileSize) {
         throw new 
UploadException(UploadConstant.UPLOAD_FILE_SIZE_LIMIT_REACHED + " " + 
uploadFile.getName());
       }
-      boolean barred = extBarred(uploadFile.getName());
-      if(barred) {
-        barred = false;
+      if(extBarred(uploadFile.getName())) {
         UploadParams uploadParams = new 
UploadParams(uploadFile.getName(),"upload.failure", uploadFile.getSize(), 
uploadFile.getContentType(), "directory", null, null);
         uploadFile.getInputStream().close();
         history.add(uploadParams);
         notify(uploadParams, uploadFile);
+      } else if(maxFileNumber != UploadConstant.MAX_FILE_NUMBER && 
storeMemory.size() >= maxFileNumber) {
+        UploadParams uploadParams = new 
UploadParams(uploadFile.getName(),"upload.too_many_files", 
uploadFile.getSize(), uploadFile.getContentType(), "directory", null, null);
+        uploadFile.getInputStream().close();
+        history.add(uploadParams);
+        notify(uploadParams, uploadFile);
+      } else {
+        storeMemory.add(uploadFile);
+        UploadParams uploadParams = new 
UploadParams(uploadFile.getName(),"upload.success", uploadFile.getSize(), 
uploadFile.getContentType(), "memory", UploadConstant.MEMORY, null);
+        history.add(uploadParams);
+        notify(uploadParams, uploadFile);
       }
-
-      if(maxFileNumber != UploadConstant.MAX_FILE_NUMBER && storeMemory.size() 
>= maxFileNumber) {
-        throw new UploadException(UploadConstant.UPLOAD_LIMIT_REACHED);
-      }
-
-      storeMemory.add(uploadFile);
-      UploadParams uploadParams = new 
UploadParams(uploadFile.getName(),"upload.success", uploadFile.getSize(), 
uploadFile.getContentType(), "memory", UploadConstant.MEMORY, null);
-      history.add(uploadParams);
-      notify(uploadParams, uploadFile);
     }
   }
 

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]