Author: dkulp
Date: Tue Jun 7 15:59:44 2011
New Revision: 1133059
URL: http://svn.apache.org/viewvc?rev=1133059&view=rev
Log:
Merged revisions 1130684 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1130684 | dkulp | 2011-06-02 13:45:05 -0400 (Thu, 02 Jun 2011) | 1 line
[CXF-3453] Add more error codes for the invalid attribute issues
........
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=1133059&r1=1133058&r2=1133059&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 Jun 7 15:59:44 2011
@@ -66,9 +66,11 @@ public class DataReaderImpl<T> extends J
public boolean handleEvent(ValidationEvent event) {
String msg = event.getMessage();
- if ((msg.startsWith("cvc-type.3.1.1: ")
- || msg.startsWith("cvc-type.3.2.2: "))
- && msg.contains(":Id")) {
+ if (msg.contains(":Id")
+ && (msg.startsWith("cvc-type.3.1.1: ")
+ || msg.startsWith("cvc-type.3.2.2: ")
+ || msg.startsWith("cvc-complex-type.3.1.1: ")
+ || msg.startsWith("cvc-complex-type.3.2.2: "))) {
return true;
}
if (origHandler != null) {
