Author: amassari
Date: Wed Jul 29 13:46:33 2009
New Revision: 798905

URL: http://svn.apache.org/viewvc?rev=798905&view=rev
Log:
If there is no complex type in the stack, fallback to the schema element 
definition, like it is done a few lines earlier (XERCESC-1808)

Modified:
    xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp

Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp?rev=798905&r1=798904&r2=798905&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp Wed Jul 29 
13:46:33 2009
@@ -134,7 +134,9 @@
         }
         else {
             // Get the element's content model or fault it in
-            XMLContentModel* elemCM = currType->getContentModel();
+            XMLContentModel* elemCM = (currType)
+                    ? currType->getContentModel()
+                    : ((SchemaElementDecl*)elemDecl)->getContentModel();
 
             // Ask it to validate and return its return
             unsigned int emptyNS = getScanner()->getEmptyNamespaceId();



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

Reply via email to