Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DF3A71055E for ; Tue, 19 Nov 2013 17:58:19 +0000 (UTC) Received: (qmail 13416 invoked by uid 500); 19 Nov 2013 17:54:47 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 13369 invoked by uid 500); 19 Nov 2013 17:54:43 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 13079 invoked by uid 99); 19 Nov 2013 17:54:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Nov 2013 17:54:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Nov 2013 17:54:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 80B08238896F; Tue, 19 Nov 2013 17:54:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Tue, 19 Nov 2013 17:54:10 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131119175410.80B08238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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("", part.getHeader("Content-ID")[0]);