Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 84102 invoked from network); 11 May 2007 03:11:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 May 2007 03:11:07 -0000 Received: (qmail 31283 invoked by uid 500); 11 May 2007 03:11:14 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 31194 invoked by uid 500); 11 May 2007 03:11:13 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 31184 invoked by uid 99); 11 May 2007 03:11:13 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 May 2007 20:11:13 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 May 2007 20:11:06 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 49FFE1A9838; Thu, 10 May 2007 20:10:46 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r537073 - /incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java Date: Fri, 11 May 2007 03:10:46 -0000 To: cxf-commits@incubator.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070511031046.49FFE1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ffang Date: Thu May 10 20:10:45 2007 New Revision: 537073 URL: http://svn.apache.org/viewvc?view=rev&rev=537073 Log: minor change in AttachmentDeserializer to read attachment boundary from message body first in case boundary in contenttype of message header mismatch the boundary in message body Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java?view=diff&rev=537073&r1=537072&r2=537073 ============================================================================== --- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java (original) +++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java Thu May 10 20:10:45 2007 @@ -91,11 +91,12 @@ } if (contentType.toLowerCase().indexOf("multipart/related") != -1) { - // First try to find the boundary from the content-type - boundary = findBoundaryFromContentType(contentType); - // If a boundary wasn't found, try the InputStream + // First try to find the boundary from InputStream + boundary = findBoundaryFromInputStream(); + // If a boundary wasn't found, try the ContentType if (null == boundary) { - boundary = findBoundaryFromInputStream(); + + boundary = findBoundaryFromContentType(contentType); } // If a boundary still wasn't found, throw an exception if (null == boundary) {