Author: dkulp
Date: Tue Nov 19 17:51:18 2013
New Revision: 1543520
URL: http://svn.apache.org/r1543520
Log:
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.7.x-fixes/api/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
cxf/branches/2.7.x-fixes/api/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
Modified:
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java?rev=1543520&r1=1543519&r2=1543520&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
(original)
+++
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
Tue Nov 19 17:51:18 2013
@@ -163,7 +163,7 @@ public class AttachmentSerializer {
.append(encoding)
.append("; type=\"")
.append(bodyCt)
- .append("\";");
+ .append("\"");
} else {
mimeBodyCt.append(bodyType);
}
Modified:
cxf/branches/2.7.x-fixes/api/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java?rev=1543520&r1=1543519&r2=1543520&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/api/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
(original)
+++
cxf/branches/2.7.x-fixes/api/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
Tue Nov 19 17:51:18 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("<[email protected]>",
part.getHeader("Content-ID")[0]);
