Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 24546 invoked from network); 24 Nov 2010 17:49:32 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 24 Nov 2010 17:49:32 -0000 Received: (qmail 96581 invoked by uid 500); 24 Nov 2010 17:50:03 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 96472 invoked by uid 500); 24 Nov 2010 17:50:03 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 96465 invoked by uid 99); 24 Nov 2010 17:50:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Nov 2010 17:50:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Nov 2010 17:50:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3CA2023889E3; Wed, 24 Nov 2010 17:48:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1038722 - in /cxf/trunk/rt/frontend/jaxrs/src: main/java/org/apache/cxf/jaxrs/utils/FormUtils.java test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java Date: Wed, 24 Nov 2010 17:48:28 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101124174828.3CA2023889E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Wed Nov 24 17:48:27 2010 New Revision: 1038722 URL: http://svn.apache.org/viewvc?rev=1038722&view=rev Log: [CXF-3147] Defaulting to UTF-8 if form media type is null Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java?rev=1038722&r1=1038721&r2=1038722&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java Wed Nov 24 17:48:27 2010 @@ -71,7 +71,7 @@ public final class FormUtils { } private static String getCharset(MediaType mt) { - String charset = mt.getParameters().get("charset"); + String charset = mt == null ? "UTF-8" : mt.getParameters().get("charset"); return charset == null ? "UTF-8" : charset; } Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java?rev=1038722&r1=1038721&r2=1038722&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java Wed Nov 24 17:48:27 2010 @@ -989,16 +989,27 @@ public class JAXRSUtilsTest extends Asse assertEquals("bar foo", params.get(1)); } - @SuppressWarnings("unchecked") @Test public void testFormParameters() throws Exception { + doTestFormParameters(true); + } + + @Test + public void testFormParametersWithoutMediaType() throws Exception { + doTestFormParameters(false); + } + + @SuppressWarnings("unchecked") + private void doTestFormParameters(boolean useMediaType) throws Exception { Class[] argType = {String.class, List.class}; Method m = Customer.class.getMethod("testFormParam", argType); MessageImpl messageImpl = new MessageImpl(); String body = "p1=1&p2=2&p2=3"; messageImpl.put(Message.REQUEST_URI, "/foo"); MultivaluedMap headers = new MetadataMap(); - headers.putSingle("Content-Type", MediaType.APPLICATION_FORM_URLENCODED); + if (useMediaType) { + headers.putSingle("Content-Type", MediaType.APPLICATION_FORM_URLENCODED); + } messageImpl.put(Message.PROTOCOL_HEADERS, headers); messageImpl.setContent(InputStream.class, new ByteArrayInputStream(body.getBytes())); List params = JAXRSUtils.processParameters(new OperationResourceInfo(m, null),