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 sa...@apache.org on 2004/11/25 10:08:15 UTC
cvs commit: ws-axis/c/src/server/simple_axis_server Makefile.am Makefile.in SimpleAxisTransport.cpp SimpleAxisTransport.h
samisa 2004/11/25 01:08:15
Modified: c/src/server/simple_axis_server Makefile.am Makefile.in
SimpleAxisTransport.cpp SimpleAxisTransport.h
Log:
Fixed problem with returning a pointer with c_str() to an unnamed string by adding class members. Fix for Jira AXISCPP-284.
Revision Changes Path
1.7 +1 -1 ws-axis/c/src/server/simple_axis_server/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/simple_axis_server/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am 16 Nov 2004 09:18:25 -0000 1.6
+++ Makefile.am 25 Nov 2004 09:08:14 -0000 1.7
@@ -3,5 +3,5 @@
AM_CPPFLAGS = $(CPPFLAGS)
simple_axis_server_SOURCES = SimpleAxisTransport.cpp SimpleAxisServer.cpp
-simple_axis_server_LDADD = $(LDFLAGS) -L$(AXISCPP_HOME)/src/engine/server ../../common/libcommon.la -lserver_engine -ldl
+simple_axis_server_LDADD = $(LDFLAGS) -L$(AXISCPP_HOME)/src/engine/server ../../common/libcommon.la -lserver_engine -ldl -lpthread
INCLUDES = -I../../../include
1.13 +1 -1 ws-axis/c/src/server/simple_axis_server/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/simple_axis_server/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile.in 16 Nov 2004 09:18:25 -0000 1.12
+++ Makefile.in 25 Nov 2004 09:08:14 -0000 1.13
@@ -193,7 +193,7 @@
SUBDIRS =
AM_CPPFLAGS = $(CPPFLAGS)
simple_axis_server_SOURCES = SimpleAxisTransport.cpp SimpleAxisServer.cpp
-simple_axis_server_LDADD = $(LDFLAGS) -L$(AXISCPP_HOME)/src/engine/server ../../common/libcommon.la -lserver_engine -ldl
+simple_axis_server_LDADD = $(LDFLAGS) -L$(AXISCPP_HOME)/src/engine/server ../../common/libcommon.la -lserver_engine -ldl -lpthread
INCLUDES = -I../../../include
all: all-recursive
1.6 +6 -5 ws-axis/c/src/server/simple_axis_server/SimpleAxisTransport.cpp
Index: SimpleAxisTransport.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/simple_axis_server/SimpleAxisTransport.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleAxisTransport.cpp 15 Nov 2004 05:29:47 -0000 1.5
+++ SimpleAxisTransport.cpp 25 Nov 2004 09:08:14 -0000 1.6
@@ -226,11 +226,11 @@
unsigned int uiStartPos =
m_strServiceURI.find (AXIS_URI_EXTENSION) +
strlen (AXIS_URI_EXTENSION) + 1;
- const char *uri =
+ m_strTransportPropertyURI =
m_strServiceURI.substr (uiStartPos,
m_strServiceURI.length () -
- uiStartPos).c_str ();
- return uri;
+ uiStartPos);
+ return m_strTransportPropertyURI.c_str();
}
else
{
@@ -243,9 +243,10 @@
if (uiOpStart != std::string::npos)
{
uiOpStart += strlen (SOAPACTION_METHODNAME_SEPARATOR);
- return m_strSOAPAction.substr (uiOpStart,
+ m_strTransportPropertyOperation = m_strSOAPAction.substr (uiOpStart,
m_strSOAPAction.length () -
- uiOpStart).c_str ();
+ uiOpStart);
+ return m_strTransportPropertyOperation.c_str();
}
else
{
1.4 +2 -0 ws-axis/c/src/server/simple_axis_server/SimpleAxisTransport.h
Index: SimpleAxisTransport.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/simple_axis_server/SimpleAxisTransport.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleAxisTransport.h 8 Nov 2004 13:34:39 -0000 1.3
+++ SimpleAxisTransport.h 25 Nov 2004 09:08:14 -0000 1.4
@@ -94,6 +94,8 @@
std::string m_strServiceURI;
std::string m_strReceived;
std::string m_strSOAPAction;
+ std::string m_strTransportPropertyURI;
+ std::string m_strTransportPropertyOperation;
void readFromClient ();
};