diff --git a/src/xercesc/validators/schema/SchemaInfo.cpp b/src/xercesc/validators/schema/SchemaInfo.cpp
index 5f4eec10b0d0132b7b73696105900e5510e4c74e..80c26b4b2ea311b410d9619f3b94945311d5e956 100644
--- a/src/xercesc/validators/schema/SchemaInfo.cpp
+++ b/src/xercesc/validators/schema/SchemaInfo.cpp
@@ -55,7 +55,6 @@ SchemaInfo::SchemaInfo(const unsigned short elemAttrDefaultQualified,
, fImportedInfoList(0)
, fImportingInfoList(0)
, fFailedRedefineList(0)
- , fImportedNSList(0)
, fRecursingAnonTypes(0)
, fRecursingTypeNames(0)
, fNonXSAttList(0)
@@ -93,7 +92,6 @@ SchemaInfo::~SchemaInfo()
delete fIncludeInfoList;
delete fImportingInfoList;
- delete fImportedNSList;
delete fFailedRedefineList;
delete fRecursingAnonTypes;
delete fRecursingTypeNames;
diff --git a/src/xercesc/validators/schema/SchemaInfo.hpp b/src/xercesc/validators/schema/SchemaInfo.hpp
index 61a2e0e653729b02fd583e98614a30bba19f10a3..9b5d81dea519eef64f2cee14266cd9d7d4a0699e 100644
--- a/src/xercesc/validators/schema/SchemaInfo.hpp
+++ b/src/xercesc/validators/schema/SchemaInfo.hpp
@@ -131,8 +131,6 @@ public:
bool circularImportExist(const unsigned int nameSpaceURI);
bool isFailedRedefine(const DOMElement* const anElem);
void addFailedRedefine(const DOMElement* const anElem);
- bool isImportingNS(const int namespaceURI);
- void addImportedNS(const int namespaceURI);
void addRecursingType(const DOMElement* const elem, const XMLCh* const name);
private:
@@ -164,7 +162,6 @@ private:
RefVectorOf<SchemaInfo>* fImportedInfoList;
RefVectorOf<SchemaInfo>* fImportingInfoList;
ValueVectorOf<const DOMElement*>* fFailedRedefineList;
- ValueVectorOf<int>* fImportedNSList;
ValueVectorOf<const DOMElement*>* fRecursingAnonTypes;
ValueVectorOf<const XMLCh*>* fRecursingTypeNames;
RefHashTableOf<DOMElement>* fTopLevelComponents[C_Count];
@@ -279,16 +276,6 @@ inline void SchemaInfo::setProcessed(const bool aValue) {
// ---------------------------------------------------------------------------
// SchemaInfo: Access methods
// ---------------------------------------------------------------------------
-inline void SchemaInfo::addImportedNS(const int namespaceURI) {
-
- if (!fImportedNSList) {
- fImportedNSList = new (fMemoryManager) ValueVectorOf<int>(4, fMemoryManager);
- }
-
- if (!fImportedNSList->containsElement(namespaceURI))
- fImportedNSList->addElement(namespaceURI);
-}
-
inline void SchemaInfo::addSchemaInfo(SchemaInfo* const toAdd,
const ListType aListType) {
@@ -300,7 +287,6 @@ inline void SchemaInfo::addSchemaInfo(SchemaInfo* const toAdd,
if (!fImportedInfoList->containsElement(toAdd)) {
fImportedInfoList->addElement(toAdd);
- addImportedNS(toAdd->getTargetNSURI());
toAdd->updateImportingInfo(this);
}
}
@@ -407,14 +393,6 @@ inline void SchemaInfo::addFailedRedefine(const DOMElement* const anElem) {
fFailedRedefineList->addElement(anElem);
}
-inline bool SchemaInfo::isImportingNS(const int namespaceURI) {
-
- if (!fImportedNSList)
- return false;
-
- return (fImportedNSList->containsElement(namespaceURI));
-}
-
inline void SchemaInfo::addRecursingType(const DOMElement* const elem,
const XMLCh* const name) {
diff --git a/src/xercesc/validators/schema/TraverseSchema.cpp b/src/xercesc/validators/schema/TraverseSchema.cpp
index 5e862b2ad15a125081d97de83a64847cc9bd1e2f..e1a929dff378ab3a20984463e63b610b4e37e1e7 100644
--- a/src/xercesc/validators/schema/TraverseSchema.cpp
+++ b/src/xercesc/validators/schema/TraverseSchema.cpp
@@ -193,6 +193,7 @@ TraverseSchema::TraverseSchema( DOMElement* const schemaRoot
, fDeclStack(0)
, fGlobalDeclarations(0)
, fNonXSAttList(0)
+ , fImportedNSList(0)
, fIC_NodeListNS(0)
, fNotationRegistry(0)
, fRedefineComponents(0)
@@ -364,6 +365,7 @@ void TraverseSchema::preprocessSchema(DOMElement* const schemaRoot,
// Add mapping for the xml prefix
currInfo->getNamespaceScope()->addPrefix(XMLUni::fgXMLString, fURIStringPool->addOrFind(XMLUni::fgXMLURIName));
}
+ addImportedNS(currInfo->getTargetNSURI());
fSchemaInfo = currInfo;
fSchemaInfoList->put((void*) fSchemaInfo->getCurrentSchemaURL(), fSchemaInfo->getTargetNSURI(), fSchemaInfo);
@@ -758,7 +760,7 @@ void TraverseSchema::preprocessImport(const DOMElement* const elem) {
bool grammarFound = (aGrammar && (aGrammar->getGrammarType() == Grammar::SchemaGrammarType));
if (grammarFound) {
- fSchemaInfo->addImportedNS(fURIStringPool->addOrFind(nameSpace));
+ addImportedNS(fURIStringPool->addOrFind(nameSpace));
}
// ------------------------------------------------------------------
@@ -787,7 +789,7 @@ void TraverseSchema::preprocessImport(const DOMElement* const elem) {
// Nothing to do
if (!srcToFill) {
if (!grammarFound && nameSpace) {
- fSchemaInfo->addImportedNS(fURIStringPool->addOrFind(nameSpace));
+ addImportedNS(fURIStringPool->addOrFind(nameSpace));
}
return;
@@ -805,6 +807,7 @@ void TraverseSchema::preprocessImport(const DOMElement* const elem) {
if (importSchemaInfo) {
fSchemaInfo->addSchemaInfo(importSchemaInfo, SchemaInfo::IMPORT);
+ addImportedNS(importSchemaInfo->getTargetNSURI());
return;
}
@@ -2961,7 +2964,7 @@ const XMLCh* TraverseSchema::traverseNotationDecl(const DOMElement* const elem,
// http://www.w3.org/TR/xmlschema-1/#src-resolve
unsigned int uriId = fURIStringPool->addOrFind(uriStr);
- if (!fSchemaInfo->isImportingNS(uriId)) {
+ if (!isImportingNS(uriId)) {
reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidNSReference, uriStr);
return 0;
@@ -5012,7 +5015,7 @@ TraverseSchema::findDTValidator(const DOMElement* const elem,
// http://www.w3.org/TR/xmlschema-1/#src-resolve
unsigned int uriId = fURIStringPool->addOrFind(uri);
- if (!fSchemaInfo->isImportingNS(uriId)) {
+ if (!isImportingNS(uriId)) {
reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidNSReference, uri);
return 0;
@@ -5283,7 +5286,7 @@ TraverseSchema::getElementTypeValidator(const DOMElement* const elem,
// http://www.w3.org/TR/xmlschema-1/#src-resolve
unsigned int uriId = fURIStringPool->addOrFind(otherSchemaURI);
- if (!fSchemaInfo->isImportingNS(uriId)) {
+ if (!isImportingNS(uriId)) {
reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidNSReference, otherSchemaURI);
return 0;
@@ -5361,7 +5364,7 @@ TraverseSchema::getAttrDatatypeValidatorNS(const DOMElement* const elem,
// http://www.w3.org/TR/xmlschema-1/#src-resolve
unsigned int uriId = fURIStringPool->addOrFind(typeURI);
- if (!fSchemaInfo->isImportingNS(uriId)) {
+ if (!isImportingNS(uriId)) {
reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidNSReference, typeURI);
return 0;
@@ -5427,7 +5430,7 @@ TraverseSchema::getElementComplexTypeInfo(const DOMElement* const elem,
// http://www.w3.org/TR/xmlschema-1/#src-resolve
unsigned int uriId = fURIStringPool->addOrFind(typeURI);
- if (!fSchemaInfo->isImportingNS(uriId))
+ if (!isImportingNS(uriId))
return 0;
Grammar* aGrammar = fGrammarResolver->getGrammar(typeURI);
@@ -5499,7 +5502,7 @@ TraverseSchema::getGlobalElemDecl(const DOMElement* const elem,
// Make sure that we have an explicit import statement.
// Clause 4 of Schema Representation Constraint:
// http://www.w3.org/TR/xmlschema-1/#src-resolve
- if (!fSchemaInfo->isImportingNS(uriId))
+ if (!isImportingNS(uriId))
{
reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidNSReference, nameURI);
return 0;
@@ -5760,7 +5763,7 @@ void TraverseSchema::processAttributeDeclRef(const DOMElement* const elem,
// http://www.w3.org/TR/xmlschema-1/#src-resolve
unsigned int uriId = fURIStringPool->addOrFind(uriStr);
- if (!fSchemaInfo->isImportingNS(uriId)) {
+ if (!isImportingNS(uriId)) {
reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidNSReference, uriStr);
return;
@@ -6410,7 +6413,7 @@ void TraverseSchema::processBaseTypeInfo(const DOMElement* const elem,
// http://www.w3.org/TR/xmlschema-1/#src-resolve
unsigned int uriId = fURIStringPool->addOrFind(uriStr);
- if (!fSchemaInfo->isImportingNS(uriId)) {
+ if (!isImportingNS(uriId)) {
reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidNSReference, uriStr);
throw TraverseSchema::InvalidComplexTypeInfo;
@@ -7097,7 +7100,7 @@ XercesGroupInfo* TraverseSchema::processGroupRef(const DOMElement* const elem,
// http://www.w3.org/TR/xmlschema-1/#src-resolve
unsigned int uriId = fURIStringPool->addOrFind(uriStr);
- if (!fSchemaInfo->isImportingNS(uriId)) {
+ if (!isImportingNS(uriId)) {
reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidNSReference, uriStr);
return 0;
@@ -7196,7 +7199,7 @@ TraverseSchema::processAttributeGroupRef(const DOMElement* const elem,
// http://www.w3.org/TR/xmlschema-1/#src-resolve
unsigned int uriId = fURIStringPool->addOrFind(uriStr);
- if (!fSchemaInfo->isImportingNS(uriId)) {
+ if (!isImportingNS(uriId)) {
reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidNSReference, uriStr);
return 0;
@@ -8657,6 +8660,7 @@ void TraverseSchema::cleanUp() {
}
delete fNonXSAttList;
+ delete fImportedNSList;
delete fNotationRegistry;
delete fRedefineComponents;
delete fIdentityConstraintNames;
diff --git a/src/xercesc/validators/schema/TraverseSchema.hpp b/src/xercesc/validators/schema/TraverseSchema.hpp
index de61a11566f2a59b7012a42d58e0e94a9c4f0566..0b7e9eb8ac7e193c77330490b9fe263708a35efc 100644
--- a/src/xercesc/validators/schema/TraverseSchema.hpp
+++ b/src/xercesc/validators/schema/TraverseSchema.hpp
@@ -236,6 +236,12 @@ private:
// -----------------------------------------------------------------------
// Private Helper methods
// -----------------------------------------------------------------------
+ /**
+ * Keep track of the xs:import found
+ */
+ bool isImportingNS(const int namespaceURI);
+ void addImportedNS(const int namespaceURI);
+
/**
* Retrived the Namespace mapping from the schema element
*/
@@ -756,6 +762,7 @@ private:
ValueVectorOf<const DOMElement*>* fDeclStack;
ValueVectorOf<unsigned int>** fGlobalDeclarations;
ValueVectorOf<DOMNode*>* fNonXSAttList;
+ ValueVectorOf<int>* fImportedNSList;
RefHashTableOf<ValueVectorOf<DOMElement*>, PtrHasher>* fIC_NodeListNS;
RefHash2KeysTableOf<XMLCh>* fNotationRegistry;
RefHash2KeysTableOf<XMLCh>* fRedefineComponents;
@@ -916,6 +923,24 @@ inline void TraverseSchema::getRedefineNewTypeName(const XMLCh* const oldTypeNam
}
}
+inline bool TraverseSchema::isImportingNS(const int namespaceURI) {
+
+ if (!fImportedNSList)
+ return false;
+
+ return (fImportedNSList->containsElement(namespaceURI));
+}
+
+inline void TraverseSchema::addImportedNS(const int namespaceURI) {
+
+ if (!fImportedNSList) {
+ fImportedNSList = new (fMemoryManager) ValueVectorOf<int>(4, fMemoryManager);
+ }
+
+ if (!fImportedNSList->containsElement(namespaceURI))
+ fImportedNSList->addElement(namespaceURI);
+}
+
XERCES_CPP_NAMESPACE_END
#endif