You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2012/08/22 12:40:39 UTC
svn commit: r1375978 - in /cxf/branches/2.6.x-fixes: ./
api/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
Author: ffang
Date: Wed Aug 22 10:40:39 2012
New Revision: 1375978
URL: http://svn.apache.org/viewvc?rev=1375978&view=rev
Log:
Merged revisions 1375972 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1375972 | ffang | 2012-08-22 18:33:58 +0800 (δΈ‰, 22 8 2012) | 1 line
[CXF-4482]AttachmentSerializer puts an extra new line
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1375972
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java?rev=1375978&r1=1375977&r2=1375978&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java (original)
+++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java Wed Aug 22 10:40:39 2012
@@ -153,7 +153,7 @@ public class AttachmentSerializer {
encoding = "UTF-8";
}
StringWriter writer = new StringWriter();
- writer.write("\r\n");
+ writer.write("\n");
writer.write("--");
writer.write(bodyBoundary);