Author: ningjiang Date: Mon Oct 13 22:41:59 2008 New Revision: 704318 URL: http://svn.apache.org/viewvc?rev=704318&view=rev Log: Merged revisions 704314 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r704314 | ningjiang | 2008-10-14 13:18:36 +0800 (Tue, 14 Oct 2008) | 9 lines Merged revisions 704312 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r704312 | ningjiang | 2008-10-14 13:14:58 +0800 (Tue, 14 Oct 2008) | 1 line CXF-1856 did a quick fix for this issue. ........ ................ Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java?rev=704318&r1=704317&r2=704318&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java (original) +++ cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java Mon Oct 13 22:41:59 2008 @@ -302,7 +302,8 @@ flush(); if (inmem) { if (currentStream instanceof ByteArrayOutputStream) { - out.append(((ByteArrayOutputStream)currentStream).toString()); + byte[] bytes = ((ByteArrayOutputStream)currentStream).toByteArray(); + out.append(IOUtils.newStringFromBytes(bytes)); } else { throw new IOException("Unknown format of currentStream"); }
