You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2001/10/21 18:02:29 UTC

cvs commit: xml-xalan/c/src/XalanSourceTree XalanSourceTreeParserLiaison.cpp

dbertoni    01/10/21 09:02:29

  Modified:    c/src/XalanSourceTree XalanSourceTreeParserLiaison.cpp
  Log:
  Use ErrorHandler if available.  Fixes bug 3886.
  
  Revision  Changes    Path
  1.20      +20 -2     xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.cpp
  
  Index: XalanSourceTreeParserLiaison.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.cpp,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- XalanSourceTreeParserLiaison.cpp	2001/09/20 18:06:00	1.19
  +++ XalanSourceTreeParserLiaison.cpp	2001/10/21 16:02:29	1.20
  @@ -229,8 +229,17 @@
   
   	theReader->setDTDHandler(&theContentHandler);
   
  -	theReader->setErrorHandler(&m_xercesParserLiaison);
  +	ErrorHandler* const		theHandler = getErrorHandler();
   
  +	if (theHandler == 0)
  +	{
  +		theReader->setErrorHandler(&m_xercesParserLiaison);
  +	}
  +	else
  +	{
  +		theReader->setErrorHandler(theHandler);
  +	}
  +
   	theReader->setLexicalHandler(&theContentHandler);
   
   	theReader->setEntityResolver(getEntityResolver());
  @@ -337,7 +346,16 @@
   
   	theReader->setDTDHandler(theDTDHandler);
   
  -	theReader->setErrorHandler(&m_xercesParserLiaison);
  +	ErrorHandler* const		theHandler = getErrorHandler();
  +
  +	if (theHandler == 0)
  +	{
  +		theReader->setErrorHandler(&m_xercesParserLiaison);
  +	}
  +	else
  +	{
  +		theReader->setErrorHandler(theHandler);
  +	}
   
   	theReader->setLexicalHandler(theLexicalHandler);
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org