martinc 2004/04/18 15:02:14
Modified: src/share/org/apache/struts/upload
CommonsMultipartRequestHandler.java
Log:
Don't rely on exception handling when obtaining the string value for a text
item, in the case where the request encoding is null.
PR: 28267
Submitted by: quartz
Revision Changes Path
1.18 +16 -7
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CommonsMultipartRequestHandler.java 8 Apr 2004 22:17:23 -0000 1.17
+++ CommonsMultipartRequestHandler.java 18 Apr 2004 22:02:14 -0000 1.18
@@ -406,15 +406,24 @@
protected void addTextParameter(HttpServletRequest request, FileItem item) {
String name = item.getFieldName();
String value = null;
+ boolean haveValue = false;
+ String encoding = request.getCharacterEncoding();
- try {
- value = item.getString(request.getCharacterEncoding());
- } catch (Exception e) {
+ if (encoding != null) {
+ try {
+ value = item.getString(encoding);
+ haveValue = true;
+ } catch (Exception e) {
+ // Handled below, since haveValue is false.
+ }
+ }
+ if (!haveValue) {
try {
value = item.getString("ISO-8859-1");
} catch (java.io.UnsupportedEncodingException uee) {
value = item.getString();
}
+ haveValue = true;
}
if (request instanceof MultipartRequestWrapper) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
