amassari 2003/11/04 06:10:05
Modified: c/src/xercesc/internal IGXMLScanner.cpp SGXMLScanner.cpp
Log:
When loading a grammar that's going to be cached, re-use the grammars already in the
cache
Revision Changes Path
1.28 +5 -2 xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp
Index: IGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- IGXMLScanner.cpp 1 Nov 2003 20:24:22 -0000 1.27
+++ IGXMLScanner.cpp 4 Nov 2003 14:10:05 -0000 1.28
@@ -2896,7 +2896,10 @@
try
{
fGrammarResolver->cacheGrammarFromParse(false);
- fGrammarResolver->useCachedGrammarInParse(false);
+ // if the new grammar has to be cached, better use the already cached
+ // grammars, or the an exception will be thrown when caching an already
+ // cached grammar
+ fGrammarResolver->useCachedGrammarInParse(toCache);
fRootGrammar = 0;
if (fValScheme == Val_Auto) {
1.46 +5 -2 xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp
Index: SGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- SGXMLScanner.cpp 4 Nov 2003 14:08:30 -0000 1.45
+++ SGXMLScanner.cpp 4 Nov 2003 14:10:05 -0000 1.46
@@ -1839,7 +1839,10 @@
try
{
fGrammarResolver->cacheGrammarFromParse(false);
- fGrammarResolver->useCachedGrammarInParse(false);
+ // if the new grammar has to be cached, better use the already cached
+ // grammars, or the an exception will be thrown when caching an already
+ // cached grammar
+ fGrammarResolver->useCachedGrammarInParse(toCache);
fRootGrammar = 0;
if (fValScheme == Val_Auto) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
