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/02/19 23:22:20 UTC
cvs commit: ws-axis/c/tools/org/apache/axis/tools/trace tracetool.conf
whitlock 2005/02/19 14:22:20
Modified: c/src/engine Axis.cpp
c/src/engine/client Call.cpp Stub.cpp
c/tests/auto_build/testcases/client/cpp
ExceptionTestDocClient.cpp
TestTransportTimeoutClient.cpp
c/tools/org/apache/axis/tools/trace tracetool.conf
Log:
Get ExceptionTestDoc working on linux by adding Axis::initialise and Axis::terminate to the testcase. Also trace Axis.cpp and initialise g_bModuleInitialized and NULL deleted pointers in Call.cpp and Stub.cpp.
Revision Changes Path
1.91 +1 -1 ws-axis/c/src/engine/Axis.cpp
Index: Axis.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/Axis.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- Axis.cpp 11 Feb 2005 11:54:47 -0000 1.90
+++ Axis.cpp 19 Feb 2005 22:22:20 -0000 1.91
@@ -87,7 +87,7 @@
AxisConfig* g_pConfig;
//Keeps track of whether initialize_module/uninitialize_module was called
-bool g_bModuleInitialize;
+bool g_bModuleInitialize = false;
void ModuleInitialize ()
{
1.97 +2 -1 ws-axis/c/src/engine/client/Call.cpp
Index: Call.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/client/Call.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- Call.cpp 18 Feb 2005 11:11:19 -0000 1.96
+++ Call.cpp 19 Feb 2005 22:22:20 -0000 1.97
@@ -89,7 +89,8 @@
if (m_bModuleInitialized)
uninitialize_module();
if (m_pcEndPointUri)
- delete [] m_pcEndPointUri;
+ delete [] m_pcEndPointUri;
+ m_pcEndPointUri = NULL;
}
int Call::setEndpointURI (const char* pchEndpointURI)
1.35 +4 -0 ws-axis/c/src/engine/client/Stub.cpp
Index: Stub.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/client/Stub.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Stub.cpp 17 Feb 2005 10:41:17 -0000 1.34
+++ Stub.cpp 19 Feb 2005 22:22:20 -0000 1.35
@@ -42,15 +42,19 @@
Stub::~Stub()
{
delete m_pCall;
+ m_pCall = NULL;
+
unsigned int j=0;
for (j = 0; j < m_vSOAPHeaderBlocks.size(); j++)
{
delete m_vSOAPHeaderBlocks[j];
+ m_vSOAPHeaderBlocks[j] = NULL;
}
for (j = 0; j < m_vSOAPMethodAttributes.size(); j++)
{
delete m_vSOAPMethodAttributes[j];
+ m_vSOAPMethodAttributes[j] = NULL;
}
}
1.9 +3 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/ExceptionTestDocClient.cpp
Index: ExceptionTestDocClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/ExceptionTestDocClient.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ExceptionTestDocClient.cpp 16 Feb 2005 13:56:53 -0000 1.8
+++ ExceptionTestDocClient.cpp 19 Feb 2005 22:22:20 -0000 1.9
@@ -1,5 +1,6 @@
#include "MathOps.hpp"
#include <axis/AxisException.hpp>
+#include <axis/Axis.hpp>
#include <ctype.h>
#include <iostream>
#include <signal.h>
@@ -35,6 +36,7 @@
i1 = 10;
i2 = 5;
+ Axis::initialize(false);
if (strcmp(op, "div") == 0)
{
for(p3 = 0; p3 < 3; p3++)
@@ -120,6 +122,7 @@
cout << "Invalid operation " << op <<endl<<endl;
PrintUsage();
}
+ Axis::terminate();
cout << "---------------------- TEST COMPLETE -----------------------------" << endl;
return 0;
}
1.5 +4 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/TestTransportTimeoutClient.cpp
Index: TestTransportTimeoutClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/TestTransportTimeoutClient.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestTransportTimeoutClient.cpp 16 Feb 2005 13:56:53 -0000 1.4
+++ TestTransportTimeoutClient.cpp 19 Feb 2005 22:22:20 -0000 1.5
@@ -1,4 +1,5 @@
#include "Timeout.hpp"
+#include <axis/Axis.hpp>
#include <stdio.h>
#include <iostream>
#include <signal.h>
@@ -20,6 +21,7 @@
if(argc>1)
url = argv[1];
+ Axis::initialize(false);
try
{
sprintf(endpoint, "%s", url);
@@ -43,7 +45,8 @@
{
cout << "Unknown exception has occured" << endl;
}
- cout << "---------------------- TEST COMPLETE -----------------------------"<< endl;
+ Axis::terminate();
+ cout << "---------------------- TEST COMPLETE -----------------------------"<< endl;
return rc;
}
1.9 +1 -1 ws-axis/c/tools/org/apache/axis/tools/trace/tracetool.conf
Index: tracetool.conf
===================================================================
RCS file: /home/cvs/ws-axis/c/tools/org/apache/axis/tools/trace/tracetool.conf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tracetool.conf 17 Jan 2005 15:10:57 -0000 1.8
+++ tracetool.conf 19 Feb 2005 22:22:20 -0000 1.9
@@ -41,7 +41,7 @@
excludefile=apr_base64.c
excludefile=apr_base64.h
excludefile=apr_xlate.h
-excludefile=Axis.cpp
+#excludefile=Axis.cpp
excludefile=spp.c
excludefile=AxisTrace.cpp
excludefile=AxisTrace.h