You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pr...@apache.org on 2005/11/24 15:23:42 UTC
svn commit: r348741 - in /webservices/axis/trunk/c/src/xml: AnyElement.h
xerces/XercesHandler.cpp
Author: prestonf
Date: Thu Nov 24 06:23:39 2005
New Revision: 348741
URL: http://svn.apache.org/viewcvs?rev=348741&view=rev
Log:
Any tests where failing because parser code was not differentiating properly between a START, END and START_END tags.
Modified:
webservices/axis/trunk/c/src/xml/AnyElement.h
webservices/axis/trunk/c/src/xml/xerces/XercesHandler.cpp
Modified: webservices/axis/trunk/c/src/xml/AnyElement.h
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/xml/AnyElement.h?rev=348741&r1=348740&r2=348741&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/xml/AnyElement.h (original)
+++ webservices/axis/trunk/c/src/xml/AnyElement.h Thu Nov 24 06:23:39 2005
@@ -51,7 +51,7 @@
* Enumeration that defines the SAX events that the AnyElement may contain
*/
typedef enum { START_ELEMENT=0, CHARACTER_ELEMENT, END_ELEMENT,
- START_PREFIX, END_PREFIX} XML_NODE_TYPE;
+ START_PREFIX, END_PREFIX, START_END_ELEMENT} XML_NODE_TYPE;
/**
* @struct AnyElement
Modified: webservices/axis/trunk/c/src/xml/xerces/XercesHandler.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/xml/xerces/XercesHandler.cpp?rev=348741&r1=348740&r2=348741&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/xml/xerces/XercesHandler.cpp (original)
+++ webservices/axis/trunk/c/src/xml/xerces/XercesHandler.cpp Thu Nov 24 06:23:39 2005
@@ -57,6 +57,7 @@
{
m_pCurrElement = m_pNextElement;
m_pNextElement->m_type = START_ELEMENT;
+ m_pNextElement->m_type2 = END_ELEMENT;
m_pNextElement->m_pchNameOrValue = XMLString::transcode(localname);
m_pNextElement->m_pchNamespace = XMLString::transcode(uri);
@@ -173,10 +174,10 @@
const XMLCh *const qname)
{
if (m_pCurrElement && (START_ELEMENT == m_pCurrElement->m_type))
- /* it seems that both startElement and endElemen events fired within a
+ /* it seems that both startElement and endElement events fired within a
single parseNext call */
{
- m_pCurrElement->m_type2 = END_ELEMENT;
+ m_pCurrElement->m_type2 = START_END_ELEMENT;
m_bEndElementFollows = true;
return;
}