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 da...@apache.org on 2004/06/10 13:07:33 UTC
cvs commit: ws-axis/c/src/transport/axis HttpTransport.cpp Receiver.cpp Receiver.hpp Sender.cpp Sender.hpp
damitha 2004/06/10 04:07:33
Modified: c/include/axis/server AxisException.h
c/src/transport/axis HttpTransport.cpp Receiver.cpp
Receiver.hpp Sender.cpp Sender.hpp
Log:
Revision Changes Path
1.16 +1 -1 ws-axis/c/include/axis/server/AxisException.h
Index: AxisException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/server/AxisException.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AxisException.h 10 Jun 2004 10:07:52 -0000 1.15
+++ AxisException.h 10 Jun 2004 11:07:33 -0000 1.16
@@ -51,7 +51,7 @@
#define THROW_AXIS_OVERFLOW_ERROR(X) throw std::overflow_error
//#define THROW_AXIS_IOS_BASE_FAILURE(X) throw std::ios_base::failure
-#define AXISC_THROW_SAME throw;
+#define AXISC_THROW_SAME throw
#else
1.33 +2 -2 ws-axis/c/src/transport/axis/HttpTransport.cpp
Index: HttpTransport.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/HttpTransport.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- HttpTransport.cpp 10 Jun 2004 10:07:53 -0000 1.32
+++ HttpTransport.cpp 10 Jun 2004 11:07:33 -0000 1.33
@@ -133,9 +133,9 @@
cout << "Transport:init() successfull" << endl;
#endif
AXISC_CATCH(AxisTransportException & chEx)
- AXISC_THROW_SAME
+ AXISC_THROW_SAME;
AXISC_CATCH(AxisException & chEx)
- AXISC_THROW_SAME
+ AXISC_THROW_SAME;
AXISC_ENDCATCH
return true;
}
1.19 +7 -12 ws-axis/c/src/transport/axis/Receiver.cpp
Index: Receiver.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/Receiver.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Receiver.cpp 10 Jun 2004 10:07:53 -0000 1.18
+++ Receiver.cpp 10 Jun 2004 11:07:33 -0000 1.19
@@ -32,7 +32,7 @@
}
-const char* Receiver::Recv() throw (AxisException)
+const char* Receiver::Recv()
{
int bodyLength;
int isHttpHeader;
@@ -45,8 +45,7 @@
return NULL;
if (0 == m_BytesRead)
{
- try
- {
+ AXISC_TRY
#ifdef _DEBUG
printf("try\n");
#endif
@@ -57,9 +56,7 @@
return NULL;
}
m_MsgSize = strlen(m_pMsg);
- }
- catch(AxisException& ex)
- {
+ AXISC_CATCH(AxisException& ex)
printf("catch\n");
/* Get the fault message. */
*m_pTrChannel >> (&m_pMsg);
@@ -67,12 +64,10 @@
#ifdef _DEBUG
/* std::cerr << ex.GetErrorMsg() << std::endl; */
#endif
- }
- catch(...)
- {
- printf("catch(...)\n");
- throw AxisException(SERVER_TRANSPORT_RECEPTION_EXCEPTION);
- }
+ AXISC_CATCH(...)
+ AXISTRACE1("SERVER_TRANSPORT_RECEPTION_EXCEPTION", CRITICAL);
+ throw THROW_AXIS_TRANSPORT_EXCEPTION(SERVER_TRANSPORT_RECEPTION_EXCEPTION);
+ AXISC_ENDCATCH
}
/* printf("m_MsgSize:%d\n", m_MsgSize); */
if (m_MsgSize > 0)
1.5 +3 -0 ws-axis/c/src/transport/axis/Receiver.hpp
Index: Receiver.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/Receiver.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Receiver.hpp 25 May 2004 08:17:30 -0000 1.4
+++ Receiver.hpp 10 Jun 2004 11:07:33 -0000 1.5
@@ -25,6 +25,9 @@
#define _AXIS_RECEIVER_HPP
#include <axis/server/AxisException.h>
+#include "AxisTransportException.h"
+#include <axis/server/AxisTrace.h>
+extern AxisTrace* g_pAT;
#include "Transport.hpp"
1.13 +6 -8 ws-axis/c/src/transport/axis/Sender.cpp
Index: Sender.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/Sender.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Sender.cpp 10 Jun 2004 10:07:53 -0000 1.12
+++ Sender.cpp 10 Jun 2004 11:07:33 -0000 1.13
@@ -41,16 +41,14 @@
m_pTrChannel->ClearAdditionalHeaders();
}
-bool Sender::Send(const char* what) throw (AxisException)
+bool Sender::Send(const char* what)
{
- try
- {
+ AXISC_TRY
*m_pTrChannel << what;
- }
- catch(...)
- {
- THROW(SERVER_TRANSPORT_SENDING_EXCEPTION);
- }
+ AXISC_CATCH(...)
+ AXISTRACE1("SERVER_TRANSPORT_SENDING_EXCEPTION", CRITICAL);
+ THROW_AXIS_TRANSPORT_EXCEPTION(SERVER_TRANSPORT_SENDING_EXCEPTION);
+ AXISC_ENDCATCH
return true;
}
1.5 +3 -0 ws-axis/c/src/transport/axis/Sender.hpp
Index: Sender.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/Sender.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Sender.hpp 9 Apr 2004 06:44:07 -0000 1.4
+++ Sender.hpp 10 Jun 2004 11:07:33 -0000 1.5
@@ -27,6 +27,9 @@
#define _AXIS_SENDER_HPP
#include "axis/server/AxisException.h"
+#include "AxisTransportException.h"
+#include <axis/server/AxisTrace.h>
+extern AxisTrace* g_pAT;
#include "Transport.hpp"