cvs commit: xml-xalan/c/src/xalanc/XalanTransformer XalanTransformer.cpp

[dbertoni]

dbertoni    2003/07/31 15:55:08

  Modified:    c/src/xalanc/XalanTransformer XalanTransformer.cpp
  Log:
  Change terminate order so extension functions are deleted before terminating 
Xalan and Xerces.
  
  Revision  Changes    Path
  1.5       +10 -8     
xml-xalan/c/src/xalanc/XalanTransformer/XalanTransformer.cpp
  
  Index: XalanTransformer.cpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/xalanc/XalanTransformer/XalanTransformer.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XalanTransformer.cpp      14 Jul 2003 23:28:47 -0000      1.4
  +++ XalanTransformer.cpp      31 Jul 2003 22:55:08 -0000      1.5
  @@ -230,6 +230,16 @@
   void
   XalanTransformer::terminate()
   {
  +     XalanExtensionsInstaller::uninstallGlobal();
  +     XalanEXSLTCommonFunctionsInstaller::uninstallGlobal();
  +     XalanEXSLTMathFunctionsInstaller::uninstallGlobal();
  +     XalanEXSLTSetFunctionsInstaller::uninstallGlobal();
  +     XalanEXSLTStringFunctionsInstaller::uninstallGlobal();
  +
  +#if defined(XALAN_USE_ICU)
  +     XPath::uninstallFunction(XPathFunctionTable::s_formatNumber);
  +#endif
  +
        // Terminate Xalan and release memory.
   #if defined(XALAN_CANNOT_DELETE_CONST)
        delete (XSLTInputSource*) s_emptyInputSource
  @@ -242,15 +252,7 @@
        s_emptyInputSource = 0;
        s_xsltInit = 0;
   
  -     XalanExtensionsInstaller::uninstallGlobal();
  -     XalanEXSLTCommonFunctionsInstaller::uninstallGlobal();
  -     XalanEXSLTMathFunctionsInstaller::uninstallGlobal();
  -     XalanEXSLTSetFunctionsInstaller::uninstallGlobal();
  -     XalanEXSLTStringFunctionsInstaller::uninstallGlobal();
  -
   #if defined(XALAN_USE_ICU)
  -     XPath::uninstallFunction(XPathFunctionTable::s_formatNumber);
  -
        ICUBridgeCleanup::cleanup();
   #endif
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]