[patch] set default encoding, if none is given

default-charset-encoding.diff (text/plain), 1.67 KB, created by Felix Schumacher on 2011-08-11 17:03:48 UTC

(hide)

Description: set default encoding, if none is given

Filename:

MIME Type:

Creator: Felix Schumacher

Created: 2011-08-11 17:03:48 UTC

Size: 1.67 KB

patch

obsolete

>diff --git a/java/org/apache/catalina/util/RequestUtil.java b/java/org/apache/catalina/util/RequestUtil.java >index ae5615a..638ccf3 100644 >--- a/java/org/apache/catalina/util/RequestUtil.java >+++ b/java/org/apache/catalina/util/RequestUtil.java >@@ -189,7 +189,9 @@ public final class RequestUtil { > byte[] bytes = null; > try { > if (encoding == null) { >- bytes = data.getBytes(Charset.defaultCharset()); >+ Charset defaultCharset = Charset.defaultCharset(); >+ bytes = data.getBytes(defaultCharset); >+ encoding = defaultCharset.toString(); > } else { > bytes = data.getBytes(B2CConverter.getCharset(encoding)); > } >diff --git a/test/org/apache/catalina/util/TestRequestUtil.java b/test/org/apache/catalina/util/TestRequestUtil.java >index 3a8d439..45c481d 100644 >--- a/test/org/apache/catalina/util/TestRequestUtil.java >+++ b/test/org/apache/catalina/util/TestRequestUtil.java >@@ -20,6 +20,9 @@ package org.apache.catalina.util; > import static org.junit.Assert.assertEquals; > import static org.junit.Assert.assertTrue; > >+import java.util.HashMap; >+import java.util.Map; >+ > import org.junit.Test; > > public class TestRequestUtil { >@@ -93,5 +96,12 @@ public class TestRequestUtil { > String result = RequestUtil.URLDecode("xxxx%c3%aa", "UTF-8"); > assertEquals("xxxx\u00ea", result); > } >+ >+ @Test >+ public void testParseParametersWithNullEncoding() { >+ String data = "dummy"; >+ Map<String, String[]> map = new HashMap<String, String[]>(); >+ RequestUtil.parseParameters(map, data, null); >+ } > > } View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]