Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 7331 invoked from network); 28 Apr 2010 20:46:33 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 28 Apr 2010 20:46:33 -0000 Received: (qmail 60166 invoked by uid 500); 28 Apr 2010 20:46:33 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 60066 invoked by uid 500); 28 Apr 2010 20:46:33 -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 60059 invoked by uid 99); 28 Apr 2010 20:46:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Apr 2010 20:46:33 +0000 X-ASF-Spam-Status: No, hits=-1359.3 required=10.0 tests=ALL_TRUSTED,AWL 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, 28 Apr 2010 20:46:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5AA2223889C5; Wed, 28 Apr 2010 20:45:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r939083 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java Date: Wed, 28 Apr 2010 20:45:42 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100428204542.5AA2223889C5@eris.apache.org> Author: sergeyb Date: Wed Apr 28 20:45:41 2010 New Revision: 939083 URL: http://svn.apache.org/viewvc?rev=939083&view=rev Log: Merged revisions 939079 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r939079 | sergeyb | 2010-04-28 21:33:05 +0100 (Wed, 28 Apr 2010) | 1 line Attempting to fix the JAXRS test ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Apr 28 20:45:41 2010 @@ -1 +1 @@ -/cxf/trunk:935945,935995,936318,937409,938804,939012 +/cxf/trunk:935945,935995,936318,937409,938804,939012,939079 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/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java?rev=939083&r1=939082&r2=939083&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java (original) +++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java Wed Apr 28 20:45:41 2010 @@ -108,7 +108,7 @@ public class PrimitiveTextProviderTest e p.writeTo("Hello, my name is Félix Agnès", String.class, String.class, null, MediaType.valueOf("text/plain;charset=ISO-8859-1"), headers, os); - assertEquals("Hello, my name is Félix Agnès", new String(os.toByteArray())); + assertEquals("Hello, my name is Félix Agnès", os.toString("ISO-8859-1")); }