You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by pe...@apache.org on 2001/10/24 01:14:22 UTC

cvs commit: xml-xerces/c/src/validators/datatype DatatypeValidatorFactory.cpp DatatypeValidatorFactory.hpp

peiyongz    01/10/23 16:14:22

  Modified:    c/src/validators/datatype DatatypeValidatorFactory.cpp
                        DatatypeValidatorFactory.hpp
  Log:
  [Bug#880] patch to PlatformUtils:init()/term() and related. from Mark Weaver
  
  Revision  Changes    Path
  1.24      +16 -6     xml-xerces/c/src/validators/datatype/DatatypeValidatorFactory.cpp
  
  Index: DatatypeValidatorFactory.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/DatatypeValidatorFactory.cpp,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- DatatypeValidatorFactory.cpp	2001/09/25 16:00:03	1.23
  +++ DatatypeValidatorFactory.cpp	2001/10/23 23:14:22	1.24
  @@ -56,6 +56,9 @@
   
   /*
    * $Log: DatatypeValidatorFactory.cpp,v $
  + * Revision 1.24  2001/10/23 23:14:22  peiyongz
  + * [Bug#880] patch to PlatformUtils:init()/term() and related. from Mark Weaver
  + *
    * Revision 1.23  2001/09/25 16:00:03  peiyongz
    * DTV Reorganization: Create native NameDTV and NCNameDTV
    *
  @@ -158,8 +161,7 @@
   #include <validators/datatype/AnyURIDatatypeValidator.hpp>
   #include <validators/datatype/AnySimpleTypeDatatypeValidator.hpp>
   #include <util/PlatformUtils.hpp>
  -#include <util/XMLDeleterFor.hpp>
  -
  +#include <util/XMLRegisterCleanup.hpp>
   
   // ---------------------------------------------------------------------------
   //  DatatypeValidatorFactory: Local const data
  @@ -341,21 +343,29 @@
   }
   
   
  +// -----------------------------------------------------------------------
  +//  Notification that lazy data has been deleted
  +// -----------------------------------------------------------------------
  +void DatatypeValidatorFactory::reinitRegistry() {
  +	delete fBuiltInRegistry;
  +	fBuiltInRegistry = 0;
  +	fRegistryExpanded = 0;
  +}
  +
   // ---------------------------------------------------------------------------
   //  DatatypeValidatorFactory: Registry initialization methods
   // ---------------------------------------------------------------------------
   void DatatypeValidatorFactory::initializeDTDRegistry()
   {
  +	static XMLRegisterCleanup builtInRegistryCleanup;
  +
   	if (fRegistryExpanded)
   		return;
   
       if (fBuiltInRegistry == 0) {
   
           fBuiltInRegistry = new RefHashTableOf<DatatypeValidator>(109);
  -        XMLPlatformUtils::registerLazyData
  -        (
  -            new XMLDeleterFor<DVHashTable>(fBuiltInRegistry)
  -        );
  +		builtInRegistryCleanup.registerCleanup(reinitRegistry);
       }
   
   
  
  
  
  1.7       +6 -1      xml-xerces/c/src/validators/datatype/DatatypeValidatorFactory.hpp
  
  Index: DatatypeValidatorFactory.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/DatatypeValidatorFactory.hpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DatatypeValidatorFactory.hpp	2001/05/28 21:11:17	1.6
  +++ DatatypeValidatorFactory.hpp	2001/10/23 23:14:22	1.7
  @@ -55,7 +55,7 @@
    */
   
   /*
  - * $Id: DatatypeValidatorFactory.hpp,v 1.6 2001/05/28 21:11:17 tng Exp $
  + * $Id: DatatypeValidatorFactory.hpp,v 1.7 2001/10/23 23:14:22 peiyongz Exp $
    */
   
   #if !defined(DATATYPEVALIDATORFACTORY_HPP)
  @@ -218,6 +218,11 @@
         * Reset datatype validator registry
         */
   	void resetRegistry();
  +
  +	// -----------------------------------------------------------------------
  +    //  Notification that lazy data has been deleted
  +    // -----------------------------------------------------------------------
  +	static void reinitRegistry();
   
   private:
       // -----------------------------------------------------------------------
  
  
  

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