You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2005/01/07 09:33:15 UTC

cvs commit: xml-xerces/c/src/xercesc/internal DGXMLScanner.cpp IGXMLScanner2.cpp SGXMLScanner.cpp XSAXMLScanner.cpp

amassari    2005/01/07 00:33:15

  Modified:    c/src/xercesc/internal DGXMLScanner.cpp IGXMLScanner2.cpp
                        SGXMLScanner.cpp XSAXMLScanner.cpp
  Log:
  scanReset() should always clear the maps used to detect duplicate attributes
  
  Revision  Changes    Path
  1.60      +2 -2      xml-xerces/c/src/xercesc/internal/DGXMLScanner.cpp
  
  Index: DGXMLScanner.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/DGXMLScanner.cpp,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- DGXMLScanner.cpp	3 Jan 2005 11:41:16 -0000	1.59
  +++ DGXMLScanner.cpp	7 Jan 2005 08:33:15 -0000	1.60
  @@ -2246,7 +2246,6 @@
       if(fUIntPoolRowTotal >= 32) 
       { // 8 KB tied up with validating attributes...
           fAttDefRegistry->removeAll();
  -        fUndeclaredAttrRegistry->removeAll();
           recreateUIntPool();
       }
       else
  @@ -2255,6 +2254,7 @@
           // though their buckets will still be tied up
           resetUIntPool();
       }
  +    fUndeclaredAttrRegistry->removeAll();
   }
   
   
  
  
  
  1.80      +3 -3      xml-xerces/c/src/xercesc/internal/IGXMLScanner2.cpp
  
  Index: IGXMLScanner2.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner2.cpp,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- IGXMLScanner2.cpp	6 Jan 2005 20:55:36 -0000	1.79
  +++ IGXMLScanner2.cpp	7 Jan 2005 08:33:15 -0000	1.80
  @@ -1251,8 +1251,6 @@
       if(fUIntPoolRowTotal >= 32) 
       { // 8 KB tied up with validating attributes...
           fAttDefRegistry->removeAll();
  -        fUndeclaredAttrRegistry->removeAll();
  -        fUndeclaredAttrRegistryNS->removeAll();
           recreateUIntPool();
       }
       else
  @@ -1261,6 +1259,8 @@
           // though their buckets will still be tied up
           resetUIntPool();
       }
  +    fUndeclaredAttrRegistry->removeAll();
  +    fUndeclaredAttrRegistryNS->removeAll();
   }
   
   
  
  
  
  1.107     +2 -3      xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp
  
  Index: SGXMLScanner.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- SGXMLScanner.cpp	7 Jan 2005 07:59:39 -0000	1.106
  +++ SGXMLScanner.cpp	7 Jan 2005 08:33:15 -0000	1.107
  @@ -3123,7 +3123,6 @@
       if(fUIntPoolRowTotal >= 32) 
       { // 8 KB tied up with validating attributes...
           fAttDefRegistry->removeAll();
  -        fUndeclaredAttrRegistryNS->removeAll();
           recreateUIntPool();
       }
       else
  @@ -3132,7 +3131,7 @@
           // though their buckets will still be tied up
           resetUIntPool();
       }
  -    
  +    fUndeclaredAttrRegistryNS->removeAll();
   }
   
   
  
  
  
  1.5       +2 -2      xml-xerces/c/src/xercesc/internal/XSAXMLScanner.cpp
  
  Index: XSAXMLScanner.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XSAXMLScanner.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XSAXMLScanner.cpp	6 Jan 2005 21:39:43 -0000	1.4
  +++ XSAXMLScanner.cpp	7 Jan 2005 08:33:15 -0000	1.5
  @@ -582,7 +582,6 @@
       if (fUIntPoolRowTotal >= 32) 
       { // 8 KB tied up with validating attributes...
           fAttDefRegistry->removeAll();
  -        fUndeclaredAttrRegistryNS->removeAll();
           recreateUIntPool();
       }
       else
  @@ -591,6 +590,7 @@
           // though their buckets will still be tied up
           resetUIntPool();
       }
  +    fUndeclaredAttrRegistryNS->removeAll();
   }
   
   
  
  
  

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