Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 5872 invoked from network); 9 Jul 2010 20:46:54 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 9 Jul 2010 20:46:54 -0000 Received: (qmail 83245 invoked by uid 500); 9 Jul 2010 20:46:54 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 83185 invoked by uid 500); 9 Jul 2010 20:46:53 -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 83178 invoked by uid 99); 9 Jul 2010 20:46:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jul 2010 20:46:53 +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; Fri, 09 Jul 2010 20:46:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 542AD23889E5; Fri, 9 Jul 2010 20:45:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r962690 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java Date: Fri, 09 Jul 2010 20:45:28 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100709204528.542AD23889E5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Fri Jul 9 20:45:27 2010 New Revision: 962690 URL: http://svn.apache.org/viewvc?rev=962690&view=rev Log: Merged revisions 959793 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r959793 | gmazza | 2010-07-01 22:52:30 +0100 (Thu, 01 Jul 2010) | 2 lines typo fixed. ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jul 9 20:45:27 2010 @@ -1 +1 @@ -/cxf/trunk:959789,960506,961051,961818 +/cxf/trunk:959789,959793,960506,961051,961818 Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java?rev=962690&r1=962689&r2=962690&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java (original) +++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java Fri Jul 9 20:45:27 2010 @@ -84,7 +84,7 @@ public class MediaTypeHeaderProvider imp private static void addParameter(Map parameters, String token) { int equalSign = token.indexOf('='); if (equalSign == -1) { - throw new IllegalArgumentException("Wrong media type parameter, seperator is missing"); + throw new IllegalArgumentException("Wrong media type parameter, separator is missing"); } parameters.put(token.substring(0, equalSign).trim().toLowerCase(), token.substring(equalSign + 1).trim());