Author: hfnukal Date: 2012-04-11 04:48:48 -0400 (Wed, 11 Apr 2012) New Revision: 8685 Modified: epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/web/handler/UploadHandler.java Log: Bug 809517 - EPP-SP: File name is not displayed correctly if it contains Portuguese accent characters during uploading Modified: epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java 2012-04-11 08:43:21 UTC (rev 8684) +++ epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java 2012-04-11 08:48:48 UTC (rev 8685) @@ -117,7 +117,6 @@ if (fileName == null) fileName = uploadId; fileName = fileName.substring(fileName.lastIndexOf('\\') + 1); - fileName = EntityEncoder.FULL.encode(fileName); String storeLocation = uploadLocation_ + "/" + uploadId + "." + fileName; Modified: epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/web/handler/UploadHandler.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/web/handler/UploadHandler.java 2012-04-11 08:43:21 UTC (rev 8684) +++ epp/portal/branches/EPP_5_2_Branch/component/web/server/src/main/java/org/exoplatform/web/handler/UploadHandler.java 2012-04-11 08:48:48 UTC (rev 8685) @@ -101,7 +101,8 @@ } value.append("\n \"").append(uploadIds[i]).append("\": {"); value.append("\n \"percent\":").append('\"').append((int)percent).append("\","); - value.append("\n \"fileName\":").append('\"').append(encodeName(upResource.getFileName())) + String fileName = EntityEncoder.FULL.encode(upResource.getFileName()); + value.append("\n \"fileName\":").append('\"').append(encodeName(fileName)) .append("\""); value.append("\n }"); if (i < uploadIds.length - 1)