husted 2004/03/21 16:41:34
Modified: src/share/org/apache/struts/upload
CommonsMultipartRequestHandler.java
Log:
Apply #27702 "MultipartPost values cannot contain latin1 characters when server is
running on linux" reported by Raimo Ihle.
Revision Changes Path
1.16 +9 -5
jakarta-struts/src/share/org/apache/struts/upload/CommonsMultipartRequestHandler.java
Index: CommonsMultipartRequestHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/upload/CommonsMultipartRequestHandler.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- CommonsMultipartRequestHandler.java 14 Mar 2004 06:23:48 -0000 1.15
+++ CommonsMultipartRequestHandler.java 22 Mar 2004 00:41:34 -0000 1.16
@@ -409,7 +409,11 @@
try {
value = item.getString(request.getCharacterEncoding());
} catch (Exception e) {
- value = item.getString();
+ try {
+ value = item.getString("ISO-8859-1");
+ } catch (java.io.UnsupportedEncodingException uee) {
+ value = item.getString();
+ }
}
if (request instanceof MultipartRequestWrapper) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]