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<T> 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) {
