Author: thomas.heute(a)jboss.com Date: 2010-12-15 12:17:08 -0500 (Wed, 15 Dec 2010) New Revision: 5594 Modified: epp/portal/branches/EPP_5_0_1_GA_JBEPP-737/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java Log: JBEPP-737: Patch for JBEPP-733: UploadService doesn't work with IE7 Modified: epp/portal/branches/EPP_5_0_1_GA_JBEPP-737/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java =================================================================== --- epp/portal/branches/EPP_5_0_1_GA_JBEPP-737/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java 2010-12-15 17:15:51 UTC (rev 5593) +++ epp/portal/branches/EPP_5_0_1_GA_JBEPP-737/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java 2010-12-15 17:17:08 UTC (rev 5594) @@ -104,6 +104,9 @@ DiskFileItem fileItem = (DiskFileItem)itemList.get(0); String fileName = fileItem.getName(); + if (fileName == null) + fileName = uploadId; + fileName = fileName.substring(fileName.lastIndexOf('\\') + 1); String storeLocation = uploadLocation_ + "/" + uploadId + "." + fileName; // commons-fileupload will store the temp file with name *.tmp