Author: mrglavas
Date: Tue Jun 16 17:02:59 2009
New Revision: 785294

URL: http://svn.apache.org/viewvc?rev=785294&view=rev
Log:
Fixing JIRA Issue #1378: http://issues.apache.org/jira/browse/XERCESJ-1378. The 
computation of [validation attempted] was not taking attributes into account. 
Patch thanks to Arthur De Magalhaes.

Modified:
    xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java

Modified: 
xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java?rev=785294&r1=785293&r2=785294&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java 
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java Tue 
Jun 16 17:02:59 2009
@@ -2919,6 +2919,10 @@
                     reportSchemaError(
                         "cvc-complex-type.3.2.2",
                         new Object[] { element.rawname, fTempQName.rawname });
+                    
+                    // We have seen an attribute that was not declared
+                    fNFullValidationDepth = fElementDepth;
+                    
                     continue;
                 }
             }
@@ -3096,7 +3100,10 @@
 
             // PSVI: validation attempted:
             attrPSVI.fValidationAttempted = AttributePSVI.VALIDATION_FULL;
-
+   
+            // We have seen an attribute that was declared.
+            fNNoneValidationDepth = fElementDepth;
+            
             String[] errors = fXSIErrorReporter.mergeContext();
             // PSVI: error codes
             attrPSVI.fErrors = errors;



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to