You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2012/02/24 15:12:35 UTC
svn commit: r1293262 - in /cxf/branches/2.3.x-fixes: ./
api/src/main/java/org/apache/cxf/io/CachedOutputStream.java
Author: ay
Date: Fri Feb 24 14:12:35 2012
New Revision: 1293262
URL: http://svn.apache.org/viewvc?rev=1293262&view=rev
Log:
Merged revisions 1293259 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................
r1293259 | ay | 2012-02-24 15:06:39 +0100 (Fri, 24 Feb 2012) | 16 lines
Merged revisions 1293258 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................
r1293258 | ay | 2012-02-24 15:03:05 +0100 (Fri, 24 Feb 2012) | 9 lines
Merged revisions 1293255 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1293255 | ay | 2012-02-24 14:58:08 +0100 (Fri, 24 Feb 2012) | 1 line
[CXF-4133] CachedOutputStream lost charsetName param
........
................
................
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 24 14:12:35 2012
@@ -1,3 +1,3 @@
-/cxf/branches/2.4.x-fixes:1292807
-/cxf/branches/2.5.x-fixes:1292793
-/cxf/trunk:1292792
+/cxf/branches/2.4.x-fixes:1292807,1293259
+/cxf/branches/2.5.x-fixes:1292793,1293258
+/cxf/trunk:1292792,1293255
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java?rev=1293262&r1=1293261&r2=1293262&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java (original)
+++ cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/io/CachedOutputStream.java Fri Feb 24 14:12:35 2012
@@ -294,7 +294,7 @@ public class CachedOutputStream extends
flush();
if (totalLength < limit
|| limit == -1) {
- writeCacheTo(out);
+ writeCacheTo(out, charsetName);
return;
}