cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r704314 - in /cxf/branches/2.1.x-fixes: ./ api/src/main/java/org/apache/cxf/io/CachedOutputStream.java
Date Tue, 14 Oct 2008 05:18:36 GMT
Author: ningjiang
Date: Mon Oct 13 22:18:36 2008
New Revision: 704314

URL: http://svn.apache.org/viewvc?rev=704314&view=rev
Log:
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.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java?rev=704314&r1=704313&r2=704314&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java (original)
+++ cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java Mon
Oct 13 22:18:36 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");
             }



Mime
View raw message