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 ro...@apache.org on 2005/02/03 06:10:21 UTC
cvs commit: ws-axis/c/src/soap SoapSerializer.h SoapSerializer.cpp
roshan 2005/02/02 21:10:21
Modified: c/include/axis IMessageData.hpp IHandlerSoapSerializer.hpp
c/src/common MessageData.h MessageData.cpp
c/src/soap SoapSerializer.h SoapSerializer.cpp
Log:
fxd the JIRA issue AXISCPP-365
Revision Changes Path
1.3 +5 -5 ws-axis/c/include/axis/IMessageData.hpp
Index: IMessageData.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/IMessageData.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IMessageData.hpp 27 Nov 2004 06:09:19 -0000 1.2
+++ IMessageData.hpp 3 Feb 2005 05:10:21 -0000 1.3
@@ -43,11 +43,11 @@
private:
virtual void getAdminUtils(IAdminUtils** pIAdminUtils)=0;
public:
- virtual int setProperty(AxisChar* pachName, const AxisChar* pachValue)=0;
- virtual int setProperty(AxisChar* pachName, const void* pachValue, int len)=0;
- virtual void setComplexProperty(AxisChar* pachName, void* pachValue, int iObjectSize)=0;
- virtual const void* getProperty(AxisChar* sName)=0;
- virtual void* getComplexProperty(AxisChar* pachName)=0;
+ virtual int setProperty(const AxisChar* pachName, const AxisChar* pachValue)=0;
+ virtual int setProperty(const AxisChar* pachName, const void* pachValue, int len)=0;
+ virtual void setComplexProperty(const AxisChar* pachName, void* pachValue, int iObjectSize)=0;
+ virtual const void* getProperty(const AxisChar* sName)=0;
+ virtual void* getComplexProperty(const AxisChar* pachName)=0;
virtual const AxisChar* AXISCALL getOperationName()=0;
virtual void AXISCALL getSoapSerializer(IWrapperSoapSerializer** pIWSS)=0;
virtual void AXISCALL getSoapDeSerializer
1.5 +2 -2 ws-axis/c/include/axis/IHandlerSoapSerializer.hpp
Index: IHandlerSoapSerializer.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/IHandlerSoapSerializer.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IHandlerSoapSerializer.hpp 13 Jan 2005 14:05:42 -0000 1.4
+++ IHandlerSoapSerializer.hpp 3 Feb 2005 05:10:21 -0000 1.5
@@ -69,8 +69,8 @@
* @return The created Header Block pointer will be returned, which the
* user can manipulate on it.
*/
- virtual IHeaderBlock* createHeaderBlock(AxisChar *pachLocalName,
- AxisChar *pachUri)=0;
+ virtual IHeaderBlock* createHeaderBlock(const AxisChar *pachLocalName,
+ const AxisChar *pachUri)=0;
/**
* Adds the given Header Block to the Serialzer.
1.21 +7 -7 ws-axis/c/src/common/MessageData.h
Index: MessageData.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/MessageData.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- MessageData.h 11 Jan 2005 17:01:31 -0000 1.20
+++ MessageData.h 3 Feb 2005 05:10:21 -0000 1.21
@@ -50,11 +50,11 @@
private:
void getAdminUtils(IAdminUtils** pIAdminUtils);
public:
- const void* getProperty(AxisChar* pachName);
- void* getComplexProperty(AxisChar* pachName);
- int setProperty(AxisChar* pachName, const AxisChar* pachValue);
- int setProperty(AxisChar* pachName, const void* pachValue, int len);
- void setComplexProperty(AxisChar* pachName, void* pachValue, int iObjectSize);
+ const void* getProperty(const AxisChar* pachName);
+ void* getComplexProperty(const AxisChar* pachName);
+ int setProperty(const AxisChar* pachName, const AxisChar* pachValue);
+ int setProperty(const AxisChar* pachName, const void* pachValue, int len);
+ void setComplexProperty(const AxisChar* pachName, void* pachValue, int iObjectSize);
const AxisChar* AXISCALL getOperationName();
void setOperationName(const AxisChar* pchOperation);
void getSoapDeSerializer(IHandlerSoapDeSerializer** pIHandlerSoapDeSerializer);
@@ -80,9 +80,9 @@
private:
static AdminUtils m_AdminUtil;
bool m_bPastPivotState;
- map <AxisChar*, AxisChar*, ltstr> m_Properties;
+ map <const AxisChar*, const AxisChar*, ltstr> m_Properties;
static const AxisChar* m_pachBlankPropertyValue;
- map <AxisChar*, void*, ltstr> m_ComplexProperties;
+ map <const AxisChar*, void*, ltstr> m_ComplexProperties;
};
AXIS_CPP_NAMESPACE_END
1.32 +8 -8 ws-axis/c/src/common/MessageData.cpp
Index: MessageData.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/MessageData.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- MessageData.cpp 11 Jan 2005 17:01:31 -0000 1.31
+++ MessageData.cpp 3 Feb 2005 05:10:21 -0000 1.32
@@ -40,13 +40,13 @@
MessageData::~MessageData ()
{
- map < AxisChar*, AxisChar*, ltstr >::iterator itCurrentItem =
+ map < const AxisChar*, const AxisChar*, ltstr >::const_iterator itCurrentItem =
m_Properties.begin ();
while (itCurrentItem != m_Properties.end ())
{
- delete [] (*itCurrentItem).first;
- delete [] (*itCurrentItem).second;
+ delete [] (char*)(*itCurrentItem).first;
+ delete [] (char*)(*itCurrentItem).second;
itCurrentItem++;
}
@@ -147,7 +147,7 @@
-int MessageData::setProperty (AxisChar* pachName, const AxisChar* pachValue)
+int MessageData::setProperty (const AxisChar* pachName, const AxisChar* pachValue)
{
AxisChar* pachTmpName = new AxisChar[strlen (pachName) + 1];
strcpy (pachTmpName, pachName);
@@ -159,7 +159,7 @@
return AXIS_SUCCESS;
}
-int MessageData::setProperty (AxisChar* pachName, const void* pachValue, int len)
+int MessageData::setProperty (const AxisChar* pachName, const void* pachValue, int len)
{
AxisChar* pachTmpName = new AxisChar[strlen (pachName) + 1];
strcpy (pachTmpName, pachName);
@@ -171,7 +171,7 @@
return AXIS_SUCCESS;
}
-void MessageData::setComplexProperty(AxisChar* pachName, void* pValue, int iObjectSize)
+void MessageData::setComplexProperty(const AxisChar* pachName, void* pValue, int iObjectSize)
{
AxisChar* pachTmpName = new AxisChar[strlen (pachName) + 1];
strcpy (pachTmpName, pachName);
@@ -186,7 +186,7 @@
* not. If it is empty then the idea is that the property is not
* available.
*/
-const void* MessageData::getProperty (AxisChar* pachName)
+const void* MessageData::getProperty (const AxisChar* pachName)
{
if (m_Properties.find (pachName) != m_Properties.end ())
{
@@ -196,7 +196,7 @@
return m_pachBlankPropertyValue;
}
-void* MessageData::getComplexProperty(AxisChar* pachName)
+void* MessageData::getComplexProperty(const AxisChar* pachName)
{
if (m_ComplexProperties.find (pachName) != m_ComplexProperties.end ())
{
1.41 +2 -2 ws-axis/c/src/soap/SoapSerializer.h
Index: SoapSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapSerializer.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- SoapSerializer.h 28 Jan 2005 16:16:55 -0000 1.40
+++ SoapSerializer.h 3 Feb 2005 05:10:21 -0000 1.41
@@ -187,8 +187,8 @@
int setSOAPMethodAttribute(Attribute* pAttribute);
SoapMethod* getSOAPMethod();
- IHeaderBlock* createHeaderBlock(AxisChar *pachLocalName,
- AxisChar *pachUri);
+ IHeaderBlock* createHeaderBlock(const AxisChar *pachLocalName,
+ const AxisChar *pachUri);
/* to add a header block to the Serializer. Probably by a handler */
int AXISCALL addHeaderBlock(IHeaderBlock* pBlk);
int AXISCALL addOutputParam(const AxisChar* pchName,
1.94 +2 -2 ws-axis/c/src/soap/SoapSerializer.cpp
Index: SoapSerializer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapSerializer.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- SoapSerializer.cpp 28 Jan 2005 17:23:34 -0000 1.93
+++ SoapSerializer.cpp 3 Feb 2005 05:10:21 -0000 1.94
@@ -849,8 +849,8 @@
}
-IHeaderBlock* SoapSerializer::createHeaderBlock(AxisChar *pachLocalName,
- AxisChar *pachUri)
+IHeaderBlock* SoapSerializer::createHeaderBlock(const AxisChar *pachLocalName,
+ const AxisChar *pachUri)
{
HeaderBlock* pHeaderBlock= new HeaderBlock(pachLocalName, pachUri);
setHeaderBlock(pHeaderBlock);