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 na...@apache.org on 2008/12/08 03:49:39 UTC
svn commit: r724236 - in /webservices/axis/trunk/c/src/soap: SoapBody.h
SoapEnvelope.cpp SoapEnvelope.h SoapHeader.h SoapSerializer.cpp
Author: nadiramra
Date: Sun Dec 7 18:49:39 2008
New Revision: 724236
URL: http://svn.apache.org/viewvc?rev=724236&view=rev
Log:
Add some useful functions to SOAP body and envelope classes.
Modified:
webservices/axis/trunk/c/src/soap/SoapBody.h
webservices/axis/trunk/c/src/soap/SoapEnvelope.cpp
webservices/axis/trunk/c/src/soap/SoapEnvelope.h
webservices/axis/trunk/c/src/soap/SoapHeader.h
webservices/axis/trunk/c/src/soap/SoapSerializer.cpp
Modified: webservices/axis/trunk/c/src/soap/SoapBody.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapBody.h?rev=724236&r1=724235&r2=724236&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapBody.h (original)
+++ webservices/axis/trunk/c/src/soap/SoapBody.h Sun Dec 7 18:49:39 2008
@@ -79,7 +79,8 @@
void setSoapMethod(SoapMethod* ptrSoapMethod);
SoapBody();
virtual ~SoapBody();
-
+
+ SoapMethod *getSoapMethod() { return m_pSoapMethod; }
};
AXIS_CPP_NAMESPACE_END
Modified: webservices/axis/trunk/c/src/soap/SoapEnvelope.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapEnvelope.cpp?rev=724236&r1=724235&r2=724236&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapEnvelope.cpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapEnvelope.cpp Sun Dec 7 18:49:39 2008
@@ -64,16 +64,7 @@
m_attributes.clear();
- // deletion of namespace declerations
- list<Attribute*>::iterator itCurrNamespaceDecls= m_namespaceDecls.begin();
-
- while (itCurrNamespaceDecls != m_namespaceDecls.end())
- {
- delete *itCurrNamespaceDecls;
- itCurrNamespaceDecls++;
- }
-
- m_namespaceDecls.clear();
+ clearNonStandardNamespaceDecl();
// deletion of soap header
delete m_pSoapHeader;
@@ -240,6 +231,24 @@
logExit()
}
+void SoapEnvelope::
+clearNonStandardNamespaceDecl()
+{
+ logEntryEngine("SoapEnvelope::clearNonStandardNamespaceDecl")
+
+ list<Attribute*>::iterator itCurrNamespaceDecls= m_namespaceDecls.begin();
+
+ while (itCurrNamespaceDecls != m_namespaceDecls.end())
+ {
+ delete *itCurrNamespaceDecls;
+ itCurrNamespaceDecls++;
+ }
+
+ m_namespaceDecls.clear();
+
+ logExit()
+}
+
int SoapEnvelope::
serializeStandardNamespaceDecl(SoapSerializer &pSZ)
{
@@ -257,5 +266,24 @@
return AXIS_SUCCESS;
}
+void SoapEnvelope::
+reset()
+{
+ logEntryEngine("SoapEnvelope::reset")
+
+ clearNonStandardNamespaceDecl();
+
+ if (m_pSoapBody)
+ {
+ SoapMethod * soapMethod = m_pSoapBody->getSoapMethod();
+ if ( soapMethod )
+ soapMethod->clearOutParams();
+ }
+
+ if ( m_pSoapHeader )
+ m_pSoapHeader->clear();
+
+ logExit()
+}
AXIS_CPP_NAMESPACE_END
Modified: webservices/axis/trunk/c/src/soap/SoapEnvelope.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapEnvelope.h?rev=724236&r1=724235&r2=724236&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapEnvelope.h (original)
+++ webservices/axis/trunk/c/src/soap/SoapEnvelope.h Sun Dec 7 18:49:39 2008
@@ -74,6 +74,9 @@
void setSoapHeader(SoapHeader* soapHeader);
SoapEnvelope();
virtual ~SoapEnvelope();
+
+ void clearNonStandardNamespaceDecl();
+ void reset();
};
AXIS_CPP_NAMESPACE_END
Modified: webservices/axis/trunk/c/src/soap/SoapHeader.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapHeader.h?rev=724236&r1=724235&r2=724236&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapHeader.h (original)
+++ webservices/axis/trunk/c/src/soap/SoapHeader.h Sun Dec 7 18:49:39 2008
@@ -132,14 +132,14 @@
*/
void addHeaderBlock(IHeaderBlock* headerBlock);
- /**
+ /**
* Deletes a header block.
*
*
*/
-int deleteHeaderBlock(const AxisChar *pName,
- const AxisChar *pNamespace);
+ int deleteHeaderBlock(const AxisChar *pName,
+ const AxisChar *pNamespace);
/**
* The Constructor.
Modified: webservices/axis/trunk/c/src/soap/SoapSerializer.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapSerializer.cpp?rev=724236&r1=724235&r2=724236&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapSerializer.cpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapSerializer.cpp Sun Dec 7 18:49:39 2008
@@ -1533,11 +1533,8 @@
m_nCounter = 0; // reset namespace prifix counter
- if( m_pSoapEnvelope && (m_pSoapEnvelope->m_pSoapBody) && (m_pSoapEnvelope->m_pSoapBody->m_pSoapMethod))
- m_pSoapEnvelope->m_pSoapBody->m_pSoapMethod->clearOutParams();
-
- if( m_pSoapEnvelope && m_pSoapEnvelope->m_pSoapHeader )
- m_pSoapEnvelope->m_pSoapHeader->clear();
+ if( m_pSoapEnvelope )
+ m_pSoapEnvelope->reset();
logExit()
}