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 2002/11/15 22:57:43 UTC

cvs commit: xml-xerces/c/src/xercesc/internal XMLScanner.cpp

peiyongz    2002/11/15 13:57:43

  Modified:    c/src/xercesc/internal XMLScanner.cpp
  Log:
  Leave thread safety issue to message loader
  
  Revision  Changes    Path
  1.25      +4 -16     xml-xerces/c/src/xercesc/internal/XMLScanner.cpp
  
  Index: XMLScanner.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLScanner.cpp,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- XMLScanner.cpp	7 Nov 2002 21:59:13 -0000	1.24
  +++ XMLScanner.cpp	15 Nov 2002 21:57:43 -0000	1.25
  @@ -1118,13 +1118,9 @@
           const unsigned int msgSize = 1023;
           XMLCh errText[msgSize + 1];
   
  -        // Lock the mutex and load the text
  +        if (!gMsgLoader->loadMsg(toEmit, errText, msgSize))
           {
  -            XMLMutexLock lockInit(&gScannerMutex());
  -            if (!gMsgLoader->loadMsg(toEmit, errText, msgSize))
  -            {
                   // <TBD> Probably should load a default msg here
  -            }
           }
   
           //
  @@ -1173,13 +1169,9 @@
           const unsigned int maxChars = 2047;
           XMLCh errText[maxChars + 1];
   
  -        // Lock the mutex and load the text
  +        if (!gMsgLoader->loadMsg(toEmit, errText, maxChars, text1, text2, text3, text4))
           {
  -            XMLMutexLock lockInit(&gScannerMutex());
  -            if (!gMsgLoader->loadMsg(toEmit, errText, maxChars, text1, text2, text3, text4))
  -            {
                   // <TBD> Should probably load a default message here
  -            }
           }
   
           //
  @@ -1228,13 +1220,9 @@
           const unsigned int maxChars = 2047;
           XMLCh errText[maxChars + 1];
   
  -        // Lock the mutex and load the text
  +        if (!gMsgLoader->loadMsg(toEmit, errText, maxChars, text1, text2, text3, text4))
           {
  -            XMLMutexLock lockInit(&gScannerMutex());
  -            if (!gMsgLoader->loadMsg(toEmit, errText, maxChars, text1, text2, text3, text4))
  -            {
                   // <TBD> Should probably load a default message here
  -            }
           }
   
           //
  
  
  

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