neilg 2003/12/30 18:36:03
Modified: c/src/xercesc/validators/common GrammarResolver.cpp
Log:
Even if the resolver has no grammars, since all schema
processors are aware of the schema-for-schemas, an XSModel
should be produced.
Revision Changes Path
1.23 +13 -2 xml-xerces/c/src/xercesc/validators/common/GrammarResolver.cpp
Index: GrammarResolver.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/GrammarResolver.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- GrammarResolver.cpp 17 Dec 2003 00:18:38 -0000 1.22
+++ GrammarResolver.cpp 31 Dec 2003 02:36:03 -0000 1.23
@@ -57,6 +57,11 @@
/*
* $Log$
+ * Revision 1.23 2003/12/31 02:36:03 neilg
+ * Even if the resolver has no grammars, since all schema
+ * processors are aware of the schema-for-schemas, an XSModel
+ * should be produced.
+ *
* Revision 1.22 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call
Initialize) is only for static data.
*
@@ -535,10 +540,14 @@
{
return fXSModel;
}
- else
+ else if (fGrammarPoolXSModel)
{
return fGrammarPoolXSModel;
}
+ else
+ {
+ fXSModel = new (fMemoryManager) XSModel(0, this, fMemoryManager);
+ }
}
}
// Not Caching...
@@ -546,6 +555,10 @@
{
xsModel = new (fMemoryManager) XSModel(fXSModel, this, fMemoryManager);
fXSModel = xsModel;
+ }
+ else
+ {
+ fXSModel = new (fMemoryManager) XSModel(0, this, fMemoryManager);
}
return fXSModel;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
