You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/11/19 18:54:10 UTC
svn commit: r1543524 - in /cxf/branches/2.6.x-fixes/api/src:
main/java/org/apache/cxf/attachment/AttachmentSerializer.java
test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
Author: dkulp
Date: Tue Nov 19 17:54:10 2013
New Revision: 1543524
URL: http://svn.apache.org/r1543524
Log:
Merged revisions 1543520 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1543520 | dkulp | 2013-11-19 12:51:18 -0500 (Tue, 19 Nov 2013) | 10 lines
Merged revisions 1543518 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1543518 | dkulp | 2013-11-19 12:48:21 -0500 (Tue, 19 Nov 2013) | 2 lines
[CXF-5383] Remove extra ; that shouldn't be there.
........
........
Modified:
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
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=1543524&r1=1543523&r2=1543524&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 Tue Nov 19 17:54:10 2013
@@ -163,7 +163,7 @@ public class AttachmentSerializer {
.append(encoding)
.append("; type=\"")
.append(bodyCt)
- .append("\";");
+ .append("\"");
} else {
mimeBodyCt.append(bodyType);
}
Modified: cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java?rev=1543524&r1=1543523&r2=1543524&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java (original)
+++ cxf/branches/2.6.x-fixes/api/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java Tue Nov 19 17:54:10 2013
@@ -102,10 +102,10 @@ public class AttachmentSerializerTest ex
MimeBodyPart part = (MimeBodyPart) multipart.getBodyPart(0);
if (xop) {
- assertEquals("application/xop+xml; charset=UTF-8; type=\"application/soap+xml\";",
+ assertEquals("application/xop+xml; charset=UTF-8; type=\"application/soap+xml\"",
part.getHeader("Content-Type")[0]);
} else {
- assertEquals("text/xml; charset=UTF-8; type=\"application/soap+xml\";",
+ assertEquals("text/xml; charset=UTF-8; type=\"application/soap+xml\"",
part.getHeader("Content-Type")[0]);
}
@@ -173,7 +173,7 @@ public class AttachmentSerializerTest ex
MimeMultipart multipart = (MimeMultipart) inMsg.getContent();
MimeBodyPart part = (MimeBodyPart) multipart.getBodyPart(0);
- assertEquals("application/xop+xml; charset=UTF-8; type=\"application/soap+xml\";",
+ assertEquals("application/xop+xml; charset=UTF-8; type=\"application/soap+xml\"",
part.getHeader("Content-Type")[0]);
assertEquals("binary", part.getHeader("Content-Transfer-Encoding")[0]);
assertEquals("<ro...@cxf.apache.org>", part.getHeader("Content-ID")[0]);