Author: borisk
Date: Fri Nov 20 13:44:14 2009
New Revision: 882548
URL: http://svn.apache.org/viewvc?rev=882548&view=rev
Log:
Clear the cached GrammarInfo list when calling resedCachedGrammarPool.
Modified:
xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp
xerces/c/trunk/src/xercesc/internal/IGXMLScanner.hpp
xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp
xerces/c/trunk/src/xercesc/internal/SGXMLScanner.hpp
xerces/c/trunk/src/xercesc/internal/XMLScanner.cpp
xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp
xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp
xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp
xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp
Modified: xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp?rev=882548&r1=882547&r2=882548&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp Fri Nov 20 13:44:14
2009
@@ -3004,6 +3004,11 @@
return loadedGrammar;
}
+void IGXMLScanner::resetCachedGrammar ()
+{
+ fCachedSchemaInfoList->removeAll ();
+}
+
Grammar* IGXMLScanner::loadDTDGrammar(const InputSource& src,
const bool toCache)
{
Modified: xerces/c/trunk/src/xercesc/internal/IGXMLScanner.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/IGXMLScanner.hpp?rev=882548&r1=882547&r2=882548&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/IGXMLScanner.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/IGXMLScanner.hpp Fri Nov 20 13:44:14
2009
@@ -91,6 +91,7 @@
, const bool toCache = false
);
+ virtual void resetCachedGrammar ();
virtual Grammar::GrammarType getCurrentGrammarType() const;
private :
Modified: xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp?rev=882548&r1=882547&r2=882548&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp Fri Nov 20 13:44:14
2009
@@ -1928,6 +1928,11 @@
return loadedGrammar;
}
+void SGXMLScanner::resetCachedGrammar ()
+{
+ fCachedSchemaInfoList->removeAll ();
+}
+
// ---------------------------------------------------------------------------
// SGXMLScanner: Private helper methods
// ---------------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/internal/SGXMLScanner.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/SGXMLScanner.hpp?rev=882548&r1=882547&r2=882548&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/SGXMLScanner.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/SGXMLScanner.hpp Fri Nov 20 13:44:14
2009
@@ -88,6 +88,8 @@
, const short grammarType
, const bool toCache = false
);
+
+ virtual void resetCachedGrammar ();
virtual Grammar::GrammarType getCurrentGrammarType() const;
protected:
Modified: xerces/c/trunk/src/xercesc/internal/XMLScanner.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLScanner.cpp?rev=882548&r1=882547&r2=882548&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLScanner.cpp Fri Nov 20 13:44:14 2009
@@ -282,6 +282,9 @@
cleanUp();
}
+void XMLScanner::resetCachedGrammar ()
+{
+}
void XMLScanner::setValidator(XMLValidator* const valToAdopt)
{
Modified: xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp?rev=882548&r1=882547&r2=882548&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp Fri Nov 20 13:44:14 2009
@@ -209,6 +209,8 @@
, const bool toCache = false
) = 0;
+ virtual void resetCachedGrammar ();
+
// -----------------------------------------------------------------------
// Getter methods
// -----------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp?rev=882548&r1=882547&r2=882548&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp Fri Nov 20 13:44:14
2009
@@ -1128,6 +1128,7 @@
void DOMLSParserImpl::resetCachedGrammarPool()
{
getGrammarResolver()->resetCachedGrammar();
+ getScanner()->resetCachedGrammar();
}
void DOMLSParserImpl::resetParse()
Modified: xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp?rev=882548&r1=882547&r2=882548&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp Fri Nov 20
13:44:14 2009
@@ -1608,6 +1608,7 @@
void SAX2XMLReaderImpl::resetCachedGrammarPool()
{
fGrammarResolver->resetCachedGrammar();
+ fScanner->resetCachedGrammar();
}
void SAX2XMLReaderImpl::setInputBufferSize(const XMLSize_t bufferSize)
Modified: xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp?rev=882548&r1=882547&r2=882548&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp Fri Nov 20 13:44:14 2009
@@ -1345,6 +1345,7 @@
void SAXParser::resetCachedGrammarPool()
{
fGrammarResolver->resetCachedGrammar();
+ fScanner->resetCachedGrammar();
}
XERCES_CPP_NAMESPACE_END
Modified: xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp?rev=882548&r1=882547&r2=882548&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp Fri Nov 20 13:44:14
2009
@@ -343,6 +343,7 @@
void XercesDOMParser::resetCachedGrammarPool()
{
getGrammarResolver()->resetCachedGrammar();
+ getScanner()->resetCachedGrammar();
}
XERCES_CPP_NAMESPACE_END
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
