cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r939698 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
Date Fri, 30 Apr 2010 14:56:39 GMT
Author: sergeyb
Date: Fri Apr 30 14:56:39 2010
New Revision: 939698

URL: http://svn.apache.org/viewvc?rev=939698&view=rev
Log:
Merged revisions 939697 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r939697 | sergeyb | 2010-04-30 15:55:06 +0100 (Fri, 30 Apr 2010) | 1 line
  
  Fixing the build failure on JDK 1.5
........

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 Fri Apr 30 14:56:39 2010
@@ -1 +1 @@
-/cxf/trunk:935945,935995,936318,937409,938804,939012,939079,939664
+/cxf/trunk:935945,935995,936318,937409,938804,939012,939079,939664,939697

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=939698&r1=939697&r2=939698&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
Fri Apr 30 14:56:39 2010
@@ -21,7 +21,6 @@ package org.apache.cxf.jaxrs.provider;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.nio.charset.Charset;
 import java.util.Arrays;
 
 import javax.ws.rs.core.MediaType;
@@ -114,9 +113,8 @@ public class PrimitiveTextProviderTest e
                   String.class, String.class, null, MediaType.valueOf("text/plain;charset=ISO-8859-1"),
                   headers, os);
         
-        Charset iso88591charset = Charset.forName("ISO-8859-1");
-        byte[] iso88591bytes = helloStringUTF16.getBytes(iso88591charset);
-        String helloStringISO88591 = new String(iso88591bytes, iso88591charset);
+        byte[] iso88591bytes = helloStringUTF16.getBytes("ISO-8859-1");
+        String helloStringISO88591 = new String(iso88591bytes, "ISO-8859-1");
         
         System.out.println(helloStringISO88591);
         



Mime
View raw message