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 sa...@apache.org on 2005/02/17 12:46:38 UTC
cvs commit: ws-axis/c/src/xml AnyElement.h
samisa 2005/02/17 03:46:38
Modified: c/src/soap SoapDeSerializer.cpp
c/src/xml/xerces XercesHandler.cpp
c/src/xml AnyElement.h
Log:
Added fixes to empty elements, e.g <tag/>, in RPC style for complex arrays.
Fix for AXISCPP-400
Revision Changes Path
1.145 +1 -1 ws-axis/c/src/soap/SoapDeSerializer.cpp
Index: SoapDeSerializer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapDeSerializer.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- SoapDeSerializer.cpp 16 Feb 2005 13:48:43 -0000 1.144
+++ SoapDeSerializer.cpp 17 Feb 2005 11:46:33 -0000 1.145
@@ -582,7 +582,7 @@
return Array;
}
- if (END_ELEMENT == m_pNode->m_type)
+ if (END_ELEMENT == m_pNode->m_type2)
{
return Array;
}
1.9 +1 -0 ws-axis/c/src/xml/xerces/XercesHandler.cpp
Index: XercesHandler.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/xerces/XercesHandler.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesHandler.cpp 15 Oct 2004 10:29:38 -0000 1.8
+++ XercesHandler.cpp 17 Feb 2005 11:46:35 -0000 1.9
@@ -150,6 +150,7 @@
/* it seems that both startElement and endElemen events fired within a
single parseNext call */
{
+ m_pCurrElement->m_type2 = END_ELEMENT;
m_bEndElementFollows = true;
return;
}
1.3 +4 -0 ws-axis/c/src/xml/AnyElement.h
Index: AnyElement.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/AnyElement.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AnyElement.h 1 Dec 2004 08:45:23 -0000 1.2
+++ AnyElement.h 17 Feb 2005 11:46:36 -0000 1.3
@@ -71,6 +71,10 @@
* Type of SAX event whose data that an AnyElement can contain.
*/
XML_NODE_TYPE m_type;
+
+ // This is to handle empty elements, e.g. <tag/>, where start and end events are fired at once
+ XML_NODE_TYPE m_type2;
+
/**
* Local name in case of StartElement or EndElement event. Character data
* in case of character data event. Namespace prefix in case of prefix