You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ca...@apache.org on 2007/07/23 17:21:08 UTC
svn commit: r558770 -
/xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
Author: cargilld
Date: Mon Jul 23 08:21:07 2007
New Revision: 558770
URL: http://svn.apache.org/viewvc?view=rev&rev=558770
Log:
Apply patch for xercesc-1591 contributed by Anton Nikolaevsky.
Modified:
xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
Modified: xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp?view=diff&rev=558770&r1=558769&r2=558770
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp Mon Jul 23 08:21:07 2007
@@ -6591,6 +6591,10 @@
return;
}
+ ComplexTypeInfo* baseTypeInfo = typeInfo->getBaseComplexTypeInfo();
+ if (baseTypeInfo && baseTypeInfo->getPreprocessed())
+ throw TraverseSchema::RecursingElement;
+
const DOMElement* child = attElem;
SchemaAttDef* attWildCard = 0;
Janitor<SchemaAttDef> janAttWildCard(0);
@@ -6621,8 +6625,7 @@
// -------------------------------------------------------------
// Handle wild card/any attribute
- // -------------------------------------------------------------
- ComplexTypeInfo* baseTypeInfo = typeInfo->getBaseComplexTypeInfo();
+ // -------------------------------------------------------------
int derivedBy = typeInfo->getDerivedBy();
unsigned int attGroupListSize = attGroupList.size();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org