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/13 13:48:40 UTC
cvs commit: ws-axis/c/src/transport/axis HttpTransport.hpp Receiver.cpp Receiver.hpp Sender.hpp
damitha 2004/06/13 04:48:40
Modified: c/src/engine HandlerLoader.h
c/src/engine/server ServerAxisEngine.h
c/src/transport/axis HttpTransport.hpp Receiver.cpp
Receiver.hpp Sender.hpp
Log:
Revision Changes Path
1.13 +2 -2 ws-axis/c/src/engine/HandlerLoader.h
Index: HandlerLoader.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/HandlerLoader.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HandlerLoader.h 18 May 2004 04:32:30 -0000 1.12
+++ HandlerLoader.h 13 Jun 2004 11:48:40 -0000 1.13
@@ -23,8 +23,8 @@
#include <axis/server/GDefine.h>
#include <axis/server/WrapperClassHandler.h>
#include "SharedObject.h"
-#include "AxisEngineException.h"
-#include "../common/AxisConfigException.h"
+#include <axis/AxisEngineException.h>
+#include <axis/AxisConfigException.h>
#include <map>
#include <string>
1.8 +4 -4 ws-axis/c/src/engine/server/ServerAxisEngine.h
Index: ServerAxisEngine.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/server/ServerAxisEngine.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServerAxisEngine.h 24 May 2004 05:44:20 -0000 1.7
+++ ServerAxisEngine.h 13 Jun 2004 11:48:40 -0000 1.8
@@ -19,10 +19,10 @@
#define AXIS_SERVERAXISENGINE_H__OF_AXIS_INCLUDED_
#include <axis/server/AxisEngine.h>
-#include "../AxisEngineException.h"
-#include "../../soap/AxisSoapException.h"
-#include "../../wsdd/AxisWsddException.h"
-#include "../../common/AxisConfigException.h"
+#include <axis/AxisEngineException.h>
+#include <axis/AxisSoapException.h>
+#include <axis/AxisWsddException.h>
+#include <axis/AxisConfigException.h>
/*
* @class ServerAxisEngine
* @brief interface for the ServerAxisEngine class.
1.7 +1 -1 ws-axis/c/src/transport/axis/HttpTransport.hpp
Index: HttpTransport.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/HttpTransport.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HttpTransport.hpp 10 Jun 2004 10:07:53 -0000 1.6
+++ HttpTransport.hpp 13 Jun 2004 11:48:40 -0000 1.7
@@ -45,7 +45,7 @@
#endif
#include <axis/server/AxisTrace.h>
extern AxisTrace* g_pAT;
-#include "AxisTransportException.h"
+#include <axis/AxisTransportException.h>
/*
* Implements HTTP transport as SOAP-Envelop carrier, for sending/receiving
1.21 +10 -6 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Receiver.cpp 10 Jun 2004 11:31:27 -0000 1.20
+++ Receiver.cpp 13 Jun 2004 11:48:40 -0000 1.21
@@ -45,7 +45,8 @@
return NULL;
if (0 == m_BytesRead)
{
- AXISC_TRY
+ try
+ {
#ifdef _DEBUG
printf("try\n");
#endif
@@ -56,18 +57,21 @@
return NULL;
}
m_MsgSize = strlen(m_pMsg);
- AXISC_CATCH(AxisException& ex)
- printf("catch\n");
+ }
+ catch(AxisException& ex)
+ {
/* Get the fault message. */
*m_pTrChannel >> (&m_pMsg);
m_MsgSize = strlen(m_pMsg);
#ifdef _DEBUG
/* std::cerr << ex.GetErrorMsg() << std::endl; */
#endif
- AXISC_CATCH(...)
+ }
+ catch(...)
+ {
AXISTRACE1("SERVER_TRANSPORT_RECEPTION_EXCEPTION", CRITICAL);
- THROW_AXIS_TRANSPORT_EXCEPTION(SERVER_TRANSPORT_RECEPTION_EXCEPTION);
- AXISC_ENDCATCH
+ throw AxisTransportException(SERVER_TRANSPORT_RECEPTION_EXCEPTION);
+ }
}
/* printf("m_MsgSize:%d\n", m_MsgSize); */
if (m_MsgSize > 0)
1.7 +1 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Receiver.hpp 10 Jun 2004 11:31:27 -0000 1.6
+++ Receiver.hpp 13 Jun 2004 11:48:40 -0000 1.7
@@ -24,8 +24,7 @@
#if !defined(_AXIS_RECEIVER_HPP)
#define _AXIS_RECEIVER_HPP
-#include <axis/server/AxisException.h>
-#include "AxisTransportException.h"
+#include <axis/AxisTransportException.h>
#include <axis/server/AxisTrace.h>
extern AxisTrace* g_pAT;
1.7 +1 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Sender.hpp 10 Jun 2004 11:31:27 -0000 1.6
+++ Sender.hpp 13 Jun 2004 11:48:40 -0000 1.7
@@ -26,8 +26,7 @@
#if !defined(_AXIS_SENDER_HPP)
#define _AXIS_SENDER_HPP
-#include "axis/server/AxisException.h"
-#include "AxisTransportException.h"
+#include <axis/AxisTransportException.h>
#include <axis/server/AxisTrace.h>
extern AxisTrace* g_pAT;