summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar damitha2010-07-17 04:10:04 +0000
committerGravatar damitha2010-07-17 04:10:04 +0000
commit8aae3360e080fa95646de9f7e31c255106556167 (patch)
treec88bbb800465bf645ac819af72d3f012ee58f39d
parent5f5976d73dfbdd6c3fe2e29e6397c8a674d887ce (diff)
downloadaxis2c-8aae3360e080fa95646de9f7e31c255106556167.tar.gz
axis2c-8aae3360e080fa95646de9f7e31c255106556167.tar.bz2
refer AXIS2C-1488
git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@965005 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--axiom/test/util/Makefile.am4
-rw-r--r--axiom/test/util/axiom_util_test.c2
-rw-r--r--neethi/test/Makefile.am1
-rw-r--r--src/core/clientapi/listener_manager.c4
4 files changed, 10 insertions, 1 deletions
diff --git a/axiom/test/util/Makefile.am b/axiom/test/util/Makefile.am
index df0fd11..46a7959 100644
--- a/axiom/test/util/Makefile.am
+++ b/axiom/test/util/Makefile.am
@@ -1,7 +1,9 @@
noinst_PROGRAMS = axiom
axiom_SOURCES = axiom_util_test.c
axiom_LDADD = \
- $(top_builddir)/src/om/libaxis2_axiom.la
+ $(top_builddir)/src/om/libaxis2_axiom.la \
+ $(top_builddir)/src/parser/guththila/libaxis2_parser.la \
+ $(top_builddir)/../util/src/libaxutil.la
INCLUDES = -I$(top_builddir)/include \
-I ../../../util/include \
diff --git a/axiom/test/util/axiom_util_test.c b/axiom/test/util/axiom_util_test.c
index bb9deb9..7f347ae 100644
--- a/axiom/test/util/axiom_util_test.c
+++ b/axiom/test/util/axiom_util_test.c
@@ -3,7 +3,9 @@
#include <axiom.h>
#include <axis2_util.h>
#include <axiom_node.h>
+#include <axiom_xml_reader.h>
#include "../../../util/test/util/create_env.h"
+
FILE *f = NULL;
axiom_node_t *node = NULL;
axiom_node_t *child = NULL;
diff --git a/neethi/test/Makefile.am b/neethi/test/Makefile.am
index b7ace58..d9dad64 100644
--- a/neethi/test/Makefile.am
+++ b/neethi/test/Makefile.am
@@ -10,5 +10,6 @@ INCLUDES = -I$(top_builddir)/include \
test_LDADD = $(top_builddir)/src/libneethi.la \
../../axiom/src/om/libaxis2_axiom.la \
+ ../../axiom/src/parser/guththila/libaxis2_parser.la \
../../util/src/libaxutil.la \
../src/libneethi.la
diff --git a/src/core/clientapi/listener_manager.c b/src/core/clientapi/listener_manager.c
index 1e3e3f2..6605bf2 100644
--- a/src/core/clientapi/listener_manager.c
+++ b/src/core/clientapi/listener_manager.c
@@ -127,7 +127,9 @@ axis2_listener_manager_make_sure_started(
listener = axis2_transport_in_desc_get_recv(transport_in, env);
if(listener)
{
+#ifdef AXIS2_SVR_MULTI_THREADED
axutil_thread_t *worker_thread = NULL;
+#endif
axis2_listener_manager_worker_func_args_t *arg_list = NULL;
arg_list = AXIS2_MALLOC(env->allocator,
sizeof(axis2_listener_manager_worker_func_args_t));
@@ -188,7 +190,9 @@ axis2_listener_manager_make_sure_started(
tl_state->listener = listener;
tl_state->waiting_calls = 0;
listener_manager->listener_map[transport] = tl_state;
+#ifdef AXIS2_SVR_MULTI_THREADED
listener_manager->listener_thread[transport] = worker_thread;
+#endif
}
}
}