neilg       2003/12/10 12:55:18

  Modified:    c/src/xercesc/validators/datatype UnionDatatypeValidator.cpp
  Log:
  fixes for canonical value production; memory management was not implemented correctly
  
  Revision  Changes    Path
  1.20      +7 -3      
xml-xerces/c/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp
  
  Index: UnionDatatypeValidator.cpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- UnionDatatypeValidator.cpp        28 Nov 2003 18:53:07 -0000      1.19
  +++ UnionDatatypeValidator.cpp        10 Dec 2003 20:55:18 -0000      1.20
  @@ -57,6 +57,9 @@
   /*
    * $Id$
    * $Log$
  + * Revision 1.20  2003/12/10 20:55:18  neilg
  + * fixes for canonical value production; memory management was not implemented 
correctly
  + *
    * Revision 1.19  2003/11/28 18:53:07  peiyongz
    * Support for getCanonicalRepresentation
    *
  @@ -487,6 +490,7 @@
   
       //get the native unionDv
       UnionDatatypeValidator* bdv = (UnionDatatypeValidator*) 
temp->getBaseValidator();
  +    MemoryManager* toUse = memMgr? memMgr : getMemoryManager();
       while (bdv)
       {
           temp = bdv;
  @@ -500,7 +504,7 @@
           try
           {
               fMemberTypeValidators->elementAt(i)->validate(rawData, 0);
  -            return 
fMemberTypeValidators->elementAt(i)->getCanonicalRepresentation(rawData);
  +            return 
fMemberTypeValidators->elementAt(i)->getCanonicalRepresentation(rawData, toUse);
           }
           catch (XMLException&)
           {
  
  
  

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

Reply via email to