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 wh...@apache.org on 2005/06/16 11:31:04 UTC
cvs commit: ws-axis/c/src/soap SoapAttachment.cpp SoapAttachment.hpp
whitlock 2005/06/16 02:31:04
Modified: c/src/server/apache2 AttachmentHelper.cpp AttachmentHelper.h
c/src/server/apache AttachmentHelper.cpp AttachmentHelper.h
c/src/soap SoapAttachment.cpp SoapAttachment.hpp
Log:
Fix server build break by making ContentIdSet optional on SoapAttachment::SoapAttachment
Revision Changes Path
1.8 +1 -2 ws-axis/c/src/server/apache2/AttachmentHelper.cpp
Index: AttachmentHelper.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/apache2/AttachmentHelper.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AttachmentHelper.cpp 16 Jun 2005 04:00:16 -0000 1.7
+++ AttachmentHelper.cpp 16 Jun 2005 09:31:03 -0000 1.8
@@ -51,8 +51,7 @@
while (blnContinue)
{
- m_pContentIdSet = new ContentIdSet();
- SoapAttachment* pSoapAttachment= new SoapAttachment(m_pContentIdSet );
+ SoapAttachment* pSoapAttachment= new SoapAttachment();
int start =0;
if (blnFirstTime) {
1.9 +0 -1 ws-axis/c/src/server/apache2/AttachmentHelper.h
Index: AttachmentHelper.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/apache2/AttachmentHelper.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AttachmentHelper.h 16 Jun 2005 04:00:16 -0000 1.8
+++ AttachmentHelper.h 16 Jun 2005 09:31:03 -0000 1.9
@@ -56,7 +56,6 @@
private:
map<string, ISoapAttachment*> mymap;
char* pMime;
- ContentIdSet *m_pContentIdSet;
public:
char* getIncomingSOAPMimeHeaders();
ISoapAttachment* getAttachment (const char* pcAttchId);
1.4 +1 -2 ws-axis/c/src/server/apache/AttachmentHelper.cpp
Index: AttachmentHelper.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/apache/AttachmentHelper.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AttachmentHelper.cpp 16 Jun 2005 04:00:16 -0000 1.3
+++ AttachmentHelper.cpp 16 Jun 2005 09:31:04 -0000 1.4
@@ -51,8 +51,7 @@
while (blnContinue)
{
- m_pContentIdSet = new ContentIdSet();
- SoapAttachment* pSoapAttachment= new SoapAttachment(m_pContentIdSet );
+ SoapAttachment* pSoapAttachment= new SoapAttachment();
int start =0;
if (blnFirstTime) {
1.4 +0 -1 ws-axis/c/src/server/apache/AttachmentHelper.h
Index: AttachmentHelper.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/apache/AttachmentHelper.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AttachmentHelper.h 16 Jun 2005 04:00:16 -0000 1.3
+++ AttachmentHelper.h 16 Jun 2005 09:31:04 -0000 1.4
@@ -56,7 +56,6 @@
private:
map<string, ISoapAttachment*> mymap;
char* pMime;
- ContentIdSet *m_pContentIdSet;
public:
char* getIncomingSOAPMimeHeaders();
ISoapAttachment* getAttachment (const char* pcAttchId);
1.11 +4 -2 ws-axis/c/src/soap/SoapAttachment.cpp
Index: SoapAttachment.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapAttachment.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SoapAttachment.cpp 15 Jun 2005 20:24:22 -0000 1.10
+++ SoapAttachment.cpp 16 Jun 2005 09:31:04 -0000 1.11
@@ -46,7 +46,8 @@
m_AttachmentHeaders = new SoapAttachmentHeaders();
m_AttachmentBody = 0;
m_pContentIdSet = pContentIdSet;
- m_AttachmentHeaders->addHeader(AXIS_CONTENT_ID, pContentIdSet->generateId());
+ if (NULL!=m_pContentIdSet)
+ m_AttachmentHeaders->addHeader(AXIS_CONTENT_ID, pContentIdSet->generateId());
}
SoapAttachment::~SoapAttachment()
@@ -59,7 +60,8 @@
void SoapAttachment::addHeader(const char* pchName, const char* pchValue)
{
// Registering the contentid here ensures that it is unique within the mime message.
- if (0==strcmp(AXIS_CONTENT_ID,pchName)) m_pContentIdSet->registerId(pchValue);
+ if (NULL!=m_pContentIdSet && 0==strcmp(AXIS_CONTENT_ID,pchName))
+ m_pContentIdSet->registerId(pchValue);
m_AttachmentHeaders->addHeader(pchName, pchValue);
}
1.9 +1 -1 ws-axis/c/src/soap/SoapAttachment.hpp
Index: SoapAttachment.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapAttachment.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SoapAttachment.hpp 15 Jun 2005 20:24:22 -0000 1.8
+++ SoapAttachment.hpp 16 Jun 2005 09:31:04 -0000 1.9
@@ -71,7 +71,7 @@
void addBody(xsd__base64Binary* objBody);
void addBody(char* pchBinaryBody);
void addHeader(const char* pchName, const char* pchValue);
- SoapAttachment(ContentIdSet *pContentIdSet);
+ SoapAttachment(ContentIdSet *pContentIdSet=NULL);
virtual ~SoapAttachment();
};