[richfaces-svn-commits] JBoss Rich Faces SVN: r9305 - trunk/framework/impl/src/main/java/org/ajax4jsf/request.
Author: andrei_exadel
Date: 2008-06-30 10:26:16 -0400 (Mon, 30 Jun 2008)
New Revision: 9305
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java
Log:
refactoring
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java
===================================================================
---
trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java 2008-06-30
14:25:04 UTC (rev 9304)
+++
trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java 2008-06-30
14:26:16 UTC (rev 9305)
@@ -292,14 +292,11 @@
private String decodeFileName(String name) {
String fileName = null;
- if (request.getParameter("_richfaces_send_http_error") != null) { // Flash
upload
- try {
- fileName = new String(name.getBytes("ISO-8859-1"), "UTF-8");
- } catch (Exception e) {
- }
- } else {
- try {
+ try {
+ if (request.getParameter("_richfaces_send_http_error") != null) {
+ fileName = new String(name.getBytes(encoding), "UTF-8");
+ } else {
StringBuffer buffer = new StringBuffer();
String[] codes = name.split(";");
if (codes != null) {
@@ -314,10 +311,11 @@
}
fileName = buffer.toString();
}
- } catch (Exception e) {
- fileName = name;
}
+ } catch (Exception e) {
+ fileName = name;
}
+
return fileName;
}
@@ -488,7 +486,7 @@
return false;
}
}
-
+
return true;
} else {
cancel();