Author: amassari
Date: Wed Jul 15 13:21:43 2009
New Revision: 794261
URL: http://svn.apache.org/viewvc?rev=794261&view=rev
Log:
DOMLSParser requires an exception to be thrown when parsing fails
Modified:
xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp
xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/root.txt
xerces/c/trunk/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc
xerces/c/trunk/src/xercesc/util/XMLDOMMsg.hpp
Modified: xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml?rev=794261&r1=794260&r2=794261&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml (original)
+++ xerces/c/trunk/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml Wed Jul 15
13:21:43 2009
@@ -840,6 +840,7 @@
<!--Messages used by DOMLSParser -->
<Message Id="LSParser_ParseInProgress" Text="parsing in progress"/>
<Message Id="LSParser_ParsingAborted" Text="parsing aborted by the
user"/>
+ <Message Id="LSParser_ParsingFailed" Text="parsing failed"/>
</FatalError>
</MsgDomain>
</MsgFile>
Modified: xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp?rev=794261&r1=794260&r2=794261&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp Wed Jul 15 13:21:43
2009
@@ -727,6 +727,9 @@
Wrapper4DOMLSInput isWrapper((DOMLSInput*)source, fEntityResolver, false,
getMemoryManager());
AbstractDOMParser::parse(isWrapper);
+ if(getErrorCount()!=0)
+ throw DOMLSException(DOMLSException::PARSE_ERR,
XMLDOMMsg::LSParser_ParsingFailed, fMemoryManager);
+
if (fUserAdoptsDocument)
return adoptDocument();
else
@@ -743,6 +746,9 @@
fFilter=0;
AbstractDOMParser::parse(systemId);
+ if(getErrorCount()!=0)
+ throw DOMLSException(DOMLSException::PARSE_ERR,
XMLDOMMsg::LSParser_ParsingFailed, fMemoryManager);
+
if (fUserAdoptsDocument)
return adoptDocument();
else
@@ -759,6 +765,9 @@
fFilter=0;
AbstractDOMParser::parse(systemId);
+ if(getErrorCount()!=0)
+ throw DOMLSException(DOMLSException::PARSE_ERR,
XMLDOMMsg::LSParser_ParsingFailed, fMemoryManager);
+
if (fUserAdoptsDocument)
return adoptDocument();
else
Modified: xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/root.txt
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/root.txt?rev=794261&r1=794260&r2=794261&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/root.txt (original)
+++ xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/root.txt Wed Jul
15 13:21:43 2009
@@ -783,6 +783,7 @@
"unrecognized node type" ,
"parsing in progress" ,
"parsing aborted by the user" ,
+ "parsing failed" ,
"F_ End " ,
}
Modified:
xerces/c/trunk/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp?rev=794261&r1=794260&r2=794261&view=diff
==============================================================================
---
xerces/c/trunk/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
(original)
+++
xerces/c/trunk/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
Wed Jul 15 13:21:43 2009
@@ -1493,10 +1493,11 @@
, {
0x0075,0x006E,0x0072,0x0065,0x0063,0x006F,0x0067,0x006E,0x0069,0x007A,0x0065,0x0064,0x0020,0x006E,0x006F,0x0064,0x0065,0x0020,0x0074,0x0079,0x0070,0x0065,0x00
}
, {
0x0070,0x0061,0x0072,0x0073,0x0069,0x006E,0x0067,0x0020,0x0069,0x006E,0x0020,0x0070,0x0072,0x006F,0x0067,0x0072,0x0065,0x0073,0x0073,0x00
}
, {
0x0070,0x0061,0x0072,0x0073,0x0069,0x006E,0x0067,0x0020,0x0061,0x0062,0x006F,0x0072,0x0074,0x0065,0x0064,0x0020,0x0062,0x0079,0x0020,0x0074,0x0068,0x0065,0x0020,0x0075,0x0073,0x0065,0x0072,0x00
}
+ , {
0x0070,0x0061,0x0072,0x0073,0x0069,0x006E,0x0067,0x0020,0x0066,0x0061,0x0069,0x006C,0x0065,0x0064,0x00
}
, { 0x0046,0x005F,0x0045,0x006E,0x0064,0x00 }
};
-const unsigned int gXMLDOMMsgArraySize = 40;
+const unsigned int gXMLDOMMsgArraySize = 41;
XERCES_CPP_NAMESPACE_END
Modified:
xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg?rev=794261&r1=794260&r2=794261&view=diff
==============================================================================
---
xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
(original)
+++
xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
Wed Jul 15 13:21:43 2009
@@ -762,5 +762,6 @@
32 unrecognized node type
33 parsing in progress
34 parsing aborted by the user
+35 parsing failed
Modified: xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc?rev=794261&r1=794260&r2=794261&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc (original)
+++ xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc Wed Jul 15
13:21:43 2009
@@ -867,6 +867,7 @@
24608 L"unrecognized node type"
24609 L"parsing in progress"
24610 L"parsing aborted by the user"
+ 24611 L"parsing failed"
END
#endif // English (U.S.) resources
Modified: xerces/c/trunk/src/xercesc/util/XMLDOMMsg.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLDOMMsg.hpp?rev=794261&r1=794260&r2=794261&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLDOMMsg.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLDOMMsg.hpp Wed Jul 15 13:21:43 2009
@@ -49,11 +49,12 @@
, Writer_NotRecognizedType = 32
, LSParser_ParseInProgress = 33
, LSParser_ParsingAborted = 34
- , F_HighBounds = 35
- , W_LowBounds = 36
- , W_HighBounds = 37
- , E_LowBounds = 38
- , E_HighBounds = 39
+ , LSParser_ParsingFailed = 35
+ , F_HighBounds = 36
+ , W_LowBounds = 37
+ , W_HighBounds = 38
+ , E_LowBounds = 39
+ , E_HighBounds = 40
};
static bool isFatal(const XMLDOMMsg::Codes toCheck)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
