Author: ghjboss Date: 2012-04-05 14:19:57 -0400 (Thu, 05 Apr 2012) New Revision: 8679 Modified: epp/portal/branches/EPP_5_2_0_GA_BZ810345/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java epp/portal/branches/EPP_5_2_0_GA_BZ810345/component/web/server/src/main/java/org/exoplatform/web/handler/UploadHandler.java Log: commit the fix for https://bugzilla.redhat.com/show_bug.cgi?id=810345 Modified: epp/portal/branches/EPP_5_2_0_GA_BZ810345/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java =================================================================== --- epp/portal/branches/EPP_5_2_0_GA_BZ810345/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java 2012-04-05 16:28:36 UTC (rev 8678) +++ epp/portal/branches/EPP_5_2_0_GA_BZ810345/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java 2012-04-05 18:19:57 UTC (rev 8679) @@ -117,7 +117,7 @@ if (fileName == null) fileName = uploadId; fileName = fileName.substring(fileName.lastIndexOf('\\') + 1); - fileName = EntityEncoder.FULL.encode(fileName); + //fileName = EntityEncoder.FULL.encode(fileName); String storeLocation = uploadLocation_ + "/" + uploadId + "." + fileName; Modified: epp/portal/branches/EPP_5_2_0_GA_BZ810345/component/web/server/src/main/java/org/exoplatform/web/handler/UploadHandler.java =================================================================== --- epp/portal/branches/EPP_5_2_0_GA_BZ810345/component/web/server/src/main/java/org/exoplatform/web/handler/UploadHandler.java 2012-04-05 16:28:36 UTC (rev 8678) +++ epp/portal/branches/EPP_5_2_0_GA_BZ810345/component/web/server/src/main/java/org/exoplatform/web/handler/UploadHandler.java 2012-04-05 18:19:57 UTC (rev 8679) @@ -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)