[jbossws-commits] JBossWS SVN: r5923 - in stack/native/trunk/src/main/java/org/jboss/ws/core: jaxrpc/binding and 1 other directories.

Author: darran.lofthouse(a)jboss.com Date: 2008-03-11 20:09:56 -0400 (Tue, 11 Mar 2008) New Revision: 5923 Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java stack/native/trunk/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java stack/native/trunk/src/main/java/org/jboss/ws/core/soap/XMLFragment.java Log: [JBWS-1763] Re-merge missing commit - Incorrect handling of charsets when the default charset is not UTF-8. Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java 2008-03-11 19:51:05 UTC (rev 5922) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java 2008-03-12 00:09:56 UTC (rev 5923) @@ -27,6 +27,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.io.UnsupportedEncodingException; import java.io.Writer; import javax.xml.transform.stream.StreamResult; @@ -51,7 +52,7 @@ { try { - IOUtils.copyStream(getOutputStream(), new ByteArrayInputStream(xmlFragment.getBytes())); + IOUtils.copyStream(getOutputStream(), new ByteArrayInputStream(xmlFragment.getBytes("UTF-8"))); } catch (IOException e) { @@ -85,6 +86,16 @@ public String toString() { - return baos.toString(); + String result = null; + try + { + result = baos.toString("UTF-8"); + } + catch (UnsupportedEncodingException e) + { + WSException.rethrow(e); + } + + return result; } } Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2008-03-11 19:51:05 UTC (rev 5922) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2008-03-12 00:09:56 UTC (rev 5923) @@ -24,6 +24,7 @@ // $Id$ import java.io.ByteArrayOutputStream; +import java.io.UnsupportedEncodingException; import javax.xml.namespace.QName; import javax.xml.rpc.encoding.Deserializer; @@ -97,7 +98,7 @@ ByteArrayOutputStream baos = new ByteArrayOutputStream(1024); StreamResult streamResult = new StreamResult(baos); tf.newTransformer().transform(source, streamResult); - xmlFragment = new String(baos.toByteArray()); + xmlFragment = new String(baos.toByteArray(),"UTF-8"); if (xmlFragment.startsWith("<?xml")) { int index = xmlFragment.indexOf(">"); @@ -109,6 +110,10 @@ { WSException.rethrow(e); } + catch (UnsupportedEncodingException e) + { + WSException.rethrow(e); + } return xmlFragment; } Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2008-03-11 19:51:05 UTC (rev 5922) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2008-03-12 00:09:56 UTC (rev 5923) @@ -30,6 +30,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.Reader; +import java.io.UnsupportedEncodingException; import javax.xml.transform.stream.StreamSource; @@ -112,7 +113,16 @@ { String retStr = null; if (bytes != null) - retStr = new String(bytes); + { + try + { + retStr = new String(bytes, "UTF-8"); + } + catch (UnsupportedEncodingException e) + { + WSException.rethrow(e); + } + } else if (chars != null) retStr = new String(chars); return "" + retStr; Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/XMLFragment.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2008-03-11 19:51:05 UTC (rev 5922) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2008-03-12 00:09:56 UTC (rev 5923) @@ -177,7 +177,7 @@ Reader reader = streamSource.getReader(); { if (reader == null) - reader = new InputStreamReader(streamSource.getInputStream()); + reader = new InputStreamReader(streamSource.getInputStream(), "UTF-8"); } char[] cbuf = new char[1024];