Author: veithen
Date: Tue Mar 10 20:48:04 2009
New Revision: 752257
URL: http://svn.apache.org/viewvc?rev=752257&view=rev
Log:
Merged changes in r744764 (When encountering an unknown node type, throw an
exception instead of returning an invalid StAX event type (0).) from
OMStAXWrapper to DOMStAXWrapper.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java
(contents, props changed)
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java?rev=752257&r1=752256&r2=752257&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java
Tue Mar 10 20:48:04 2009
@@ -1055,7 +1055,7 @@
* @return Returns int.
*/
private int generateEvents(OMNode node) {
- int returnEvent = 0;
+ int returnEvent;
int nodeType = node.getType();
switch (nodeType) {
case OMNode.ELEMENT_NODE:
@@ -1072,8 +1072,9 @@
case OMNode.CDATA_SECTION_NODE:
returnEvent = generateCdataEvents();
break;
- default:
- break; // just ignore any other nodes
+ default :
+ throw new OMStreamingException("Encountered node with unknown
node type "
+ + nodeType);
}
return returnEvent;
}
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Mar 10 20:48:04 2009
@@ -0,0 +1 @@
+/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMStAXWrapper.java:744764
