cargilld 2004/10/13 11:01:32
Modified: c/src/xercesc/internal IGXMLScanner.cpp SGXMLScanner.cpp
Log:
Fix for jira bug 1282: empty exception message being generated
Revision Changes Path
1.76 +5 -3 xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp
Index: IGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- IGXMLScanner.cpp 21 Sep 2004 16:10:47 -0000 1.75
+++ IGXMLScanner.cpp 13 Oct 2004 18:01:32 -0000 1.76
@@ -1169,8 +1169,10 @@
if (fGrammarType == Grammar::SchemaGrammarType) {
if (!isRoot)
{
- // update error information
- fErrorStack->push(fErrorStack->pop() ||
fPSVIElemContext.fErrorOccurred);
+ // update error information
+ fErrorStack->push((fErrorStack->size() && fErrorStack->pop()) ||
fPSVIElemContext.fErrorOccurred);
+
+
}
}
1.99 +2 -2 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.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- SGXMLScanner.cpp 29 Sep 2004 19:23:32 -0000 1.98
+++ SGXMLScanner.cpp 13 Oct 2004 18:01:32 -0000 1.99
@@ -1025,7 +1025,7 @@
if (!isRoot)
{
// update error information
- fErrorStack->push(fErrorStack->pop() || fPSVIElemContext.fErrorOccurred);
+ fErrorStack->push((fErrorStack->size() && fErrorStack->pop()) ||
fPSVIElemContext.fErrorOccurred);
}
// If this was the root, then done with content
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
