Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 77929 invoked from network); 12 Apr 2011 23:31:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 Apr 2011 23:31:47 -0000 Received: (qmail 11502 invoked by uid 500); 12 Apr 2011 23:31:47 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 11415 invoked by uid 500); 12 Apr 2011 23:31:47 -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 11408 invoked by uid 99); 12 Apr 2011 23:31:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Apr 2011 23:31:47 +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, 12 Apr 2011 23:31:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D08932388962; Tue, 12 Apr 2011 23:31:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1091597 - in /cxf/branches/2.3.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java Date: Tue, 12 Apr 2011 23:31:23 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110412233123.D08932388962@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Apr 12 23:31:23 2011 New Revision: 1091597 URL: http://svn.apache.org/viewvc?rev=1091597&view=rev Log: Merged revisions 1091593 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1091593 | dkulp | 2011-04-12 19:10:57 -0400 (Tue, 12 Apr 2011) | 1 line [CXF-3453] Fix for the complex type use case in addition to simpleType ........ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java?rev=1091597&r1=1091596&r2=1091597&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java (original) +++ cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java Tue Apr 12 23:31:23 2011 @@ -66,7 +66,9 @@ public class DataReaderImpl extends J public boolean handleEvent(ValidationEvent event) { String msg = event.getMessage(); - if (msg.startsWith("cvc-type.3.1.1: ") && msg.contains(":Id")) { + if ((msg.startsWith("cvc-type.3.1.1: ") + || msg.startsWith("cvc-type.3.2.2: ")) + && msg.contains(":Id")) { return true; } if (origHandler != null) {