xalan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbert...@apache.org
Subject cvs commit: xml-xalan/c/src/xalanc/XSLT XSLTEngineImpl.cpp
Date Mon, 15 Nov 2004 07:52:46 GMT
dbertoni    2004/11/14 23:52:46

  Modified:    c/src/xalanc/XSLT XSLTEngineImpl.cpp
  Log:
  Fixed bug where XML identifier was getting clobbered.
  
  Revision  Changes    Path
  1.24      +10 -8     xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.cpp
  
  Index: XSLTEngineImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.cpp,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- XSLTEngineImpl.cpp	14 Nov 2004 21:13:08 -0000	1.23
  +++ XSLTEngineImpl.cpp	15 Nov 2004 07:52:46 -0000	1.24
  @@ -534,13 +534,13 @@
   
   	if(0 == sourceTree)
   	{
  -        const CCGetAndReleaseCachedString   theGuard(m_xpathConstructionContext);
  -	
  -		XalanDOMString&     xmlIdentifier = theGuard.get();
  +        const CCGetAndReleaseCachedString   theGuard1(m_xpathConstructionContext);
  +
  +		XalanDOMString&     xmlIdentifier = theGuard1.get();
   
           if (0 != inputSource.getSystemId())
   		{
  -			inputSource.getSystemId();
  +			xmlIdentifier = inputSource.getSystemId();
   		}
   		else
   		{
  @@ -551,14 +551,16 @@
   
   		if(m_diagnosticsPrintWriter != 0)
   		{
  +            const CCGetAndReleaseCachedString   theGuard2(m_xpathConstructionContext);
  +
   			// In case we have a fragment identifier, go ahead and 
   			// try to parse the XML here.
   			diag(
                   XalanMessageLoader::getMessage(
                       XalanMessages::Parsing_1Param,
  -                    theGuard.get(),
  +                    theGuard2.get(),
                       xmlIdentifier,
  -                    theGuard.get()));
  +                    theGuard1.get()));
   
   			pushTime(&xmlIdentifier);
   		}
  @@ -579,12 +581,12 @@
   
           if(0 != m_diagnosticsPrintWriter)
   		{
  -            const CCGetAndReleaseCachedString   theGuard(m_xpathConstructionContext);
  +            const CCGetAndReleaseCachedString   theGuard3(m_xpathConstructionContext);
   
   			displayDuration(
   				XalanMessageLoader::getMessage(
                       XalanMessages::ParseOf_1Param,
  -                    theGuard.get(),
  +                    theGuard3.get(),
                       xmlIdentifier),
   				&xmlIdentifier);
   		}
  
  
  

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


Mime
View raw message