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 2006/02/23 03:37:18 UTC
svn commit: r380030 - in /webservices/axis2/trunk/c: ides/anjuta/
modules/core/addr/ modules/core/clientapi/ modules/core/context/
modules/core/deployment/ modules/core/engine/
modules/core/transport/http/receiver/ modules/util/ test/core/deployment/
Author: damitha
Date: Wed Feb 22 18:37:16 2006
New Revision: 380030
URL: http://svn.apache.org/viewcvs?rev=380030&view=rev
Log:
Fixed a bug which occured after my yesterday commit
Modified:
webservices/axis2/trunk/c/ides/anjuta/axis2c.prj
webservices/axis2/trunk/c/modules/core/addr/Makefile.am
webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am
webservices/axis2/trunk/c/modules/core/context/Makefile.am
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
webservices/axis2/trunk/c/modules/core/engine/conf.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/Makefile.am
webservices/axis2/trunk/c/modules/util/property.c
webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
Modified: webservices/axis2/trunk/c/ides/anjuta/axis2c.prj
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/ides/anjuta/axis2c.prj?rev=380030&r1=380029&r2=380030&view=diff
==============================================================================
--- webservices/axis2/trunk/c/ides/anjuta/axis2c.prj (original)
+++ webservices/axis2/trunk/c/ides/anjuta/axis2c.prj Wed Feb 22 18:37:16 2006
@@ -1,4 +1,4 @@
-# Anjuta Version 1.2.3
+# Anjuta Version 1.2.4
Compatibility Level: 1
<PROJECT_DESCRIPTION_START>
@@ -22,7 +22,7 @@
props.file.type=project
-anjuta.version=1.2.3
+anjuta.version=1.2.4
anjuta.compatibility.level=1
project.name=axis2c
@@ -180,7 +180,6 @@
include/axis2_wsdl_binding_op.h\
include/axis2_wsdl_op.h\
include/axis2_wsdl_soap_op.h\
- include/axis2_desc_builder.h\
modules/core/deployment/axis2_deployment.h\
include/axis2_om_child_element_iterator.h\
include/axis2_om_children_qname_iterator.h\
@@ -188,9 +187,7 @@
include/axis2_class_loader.h\
include/axis2_dll_desc.h\
include/axis2_svc_skeleton.h\
- include/axis2_dep_engine.h\
include/axis2_arch_file_data.h\
- include/axis2_arch_reader.h\
include/axis2_ws_info.h\
include/axis2_ws_info_list.h\
test/unit/util/util_dir_handler_test.h\
@@ -198,7 +195,6 @@
include/axis2_file_handler.h\
modules/platforms/unix/axis2_unix.h\
modules/platforms/axis2_platform_auto_sense.h\
- include/axis2_conf_builder.h\
include/axis2_module_builder.h\
include/axis2_svc_builder.h\
include/axis2_svc_grp_builder.h\
@@ -248,7 +244,16 @@
include/axis2_uuid_gen.h\
include/axis2_conf_init.h\
include/axis2_svr_callback.h\
- include/axis2_addr_mod.h
+ include/axis2_addr_mod.h\
+ modules/core/deployment/axis2_arch_file_data.h\
+ modules/core/deployment/axis2_arch_reader.h\
+ modules/core/deployment/axis2_conf_builder.h\
+ modules/core/deployment/axis2_dep_engine.h\
+ modules/core/deployment/axis2_desc_builder.h\
+ modules/core/deployment/axis2_module_builder.h\
+ modules/core/deployment/axis2_svc_builder.h\
+ modules/core/deployment/axis2_svc_grp_builder.h\
+ modules/util/axis2_property.h
module.source.name=.
module.source.type=
@@ -439,7 +444,8 @@
modules/core/receivers/svr_callback.c\
modules/mod_addr/addr_in_handler.c\
modules/mod_addr/addr_out_handler.c\
- modules/mod_addr/mod_addr.c
+ modules/mod_addr/mod_addr.c\
+ modules/util/property.c
module.pixmap.name=.
module.pixmap.type=
Modified: webservices/axis2/trunk/c/modules/core/addr/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/addr/Makefile.am?rev=380030&r1=380029&r2=380030&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/addr/Makefile.am Wed Feb 22 18:37:16 2006
@@ -1,2 +1,18 @@
TESTS =
+noinst_LTLIBRARIES = libaxis2_addr.la
+
+libaxis2_addr_la_SOURCES = \
+ relates_to.c \
+ svc_name.c \
+ any_content_type.c \
+ endpoint_ref.c \
+ msg_info_headers.c
+
+INCLUDES = -I$(top_builddir)/include \
+ -I$(top_builddir)/modules/util \
+ -I$(top_builddir)/modules/wsdl \
+ -I$(top_builddir)/modules/core/engine \
+ -I$(top_builddir)/modules/core/transport \
+ -I$(top_builddir)/modules/xml/parser \
+ -I$(top_builddir)/modules/platforms
Modified: webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am?rev=380030&r1=380029&r2=380030&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am Wed Feb 22 18:37:16 2006
@@ -1,6 +1,25 @@
TESTS =
+noinst_LTLIBRARIES = libaxis2_clientapi.la
+libaxis2_clientapi_la_SOURCES = \
+ async_result.c \
+ callback.c \
+ mep_client.c \
+ listener_manager.c \
+ callback_recv.c \
+ call.c \
+ msg_sender.c \
+ stub.c
+
noinst_HEADERS = callback_recv.h \
listener_manager.h \
axis2_msg_sender.h
+INCLUDES = -I$(top_builddir)/include \
+ -I$(top_builddir)/modules/util \
+ -I$(top_builddir)/modules/wsdl \
+ -I$(top_builddir)/modules/core/engine \
+ -I$(top_builddir)/modules/core/deployment \
+ -I$(top_builddir)/modules/core/transport \
+ -I$(top_builddir)/modules/xml/parser \
+ -I$(top_builddir)/modules/platforms
Modified: webservices/axis2/trunk/c/modules/core/context/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/Makefile.am?rev=380030&r1=380029&r2=380030&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/context/Makefile.am Wed Feb 22 18:37:16 2006
@@ -1 +1,18 @@
TESTS =
+noinst_LTLIBRARIES = libaxis2_context.la
+
+libaxis2_context_la_SOURCES = \
+ ctx.c \
+ msg_ctx.c \
+ op_ctx.c \
+ svc_ctx.c \
+ svc_grp_ctx.c \
+ conf_ctx.c
+
+INCLUDES = -I$(top_builddir)/include \
+ -I$(top_builddir)/modules/util \
+ -I$(top_builddir)/modules/wsdl \
+ -I$(top_builddir)/modules/core/engine \
+ -I$(top_builddir)/modules/core/transport \
+ -I$(top_builddir)/modules/xml/parser \
+ -I$(top_builddir)/modules/platforms
Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?rev=380030&r1=380029&r2=380030&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Wed Feb 22 18:37:16 2006
@@ -588,6 +588,12 @@
dep_engine->ops = NULL;
}
+ if(engine_impl)
+ {
+ AXIS2_FREE((*env)->allocator, engine_impl);
+ engine_impl = NULL;
+ }
+
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/phases_info.c?rev=380030&r1=380029&r2=380030&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/phases_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/phases_info.c Wed Feb 22 18:37:16 2006
@@ -303,9 +303,10 @@
AXIS2_ENV_CHECK(env, NULL);
info_impl = AXIS2_INTF_TO_IMPL(phases_info);
- op_in_phases = axis2_array_list_create(env, 20);
+ op_in_phases = axis2_array_list_create(env, 0);
if(!op_in_phases)
{
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
phase = axis2_phase_create(env, AXIS2_PHASE_POLICY_DETERMINATION);
@@ -365,12 +366,15 @@
AXIS2_ENV_CHECK(env, NULL);
info_impl = AXIS2_INTF_TO_IMPL(phases_info);
- op_out_phases = axis2_array_list_create(env, 20);
- if(!info_impl->out_phases)
+ op_out_phases = axis2_array_list_create(env, 0);
+ if(!op_out_phases)
{
- return op_out_phases;
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
- size = AXIS2_ARRAY_LIST_SIZE(info_impl->out_phases, env);
+
+ if(info_impl->out_phases)
+ size = AXIS2_ARRAY_LIST_SIZE(info_impl->out_phases, env);
for (i = 0; i < size; i++)
{
phase_name = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(info_impl->out_phases, env, i);
@@ -430,12 +434,22 @@
AXIS2_ENV_CHECK(env, NULL);
info_impl = AXIS2_INTF_TO_IMPL(phases_info);
- op_in_faultphases = axis2_array_list_create(env, 20);
+ op_in_faultphases = axis2_array_list_create(env, 0);
+ if(!op_in_faultphases)
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
+
if(!info_impl->in_faultphases)
{
- return op_in_faultphases;
+ return NULL;
}
size = AXIS2_ARRAY_LIST_SIZE(info_impl->in_faultphases, env);
+ if(0 == size)
+ {
+ return NULL;
+ }
for (i = 0; i < size; i++)
{
phase_name = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(info_impl->in_faultphases, env, i);
@@ -469,12 +483,20 @@
AXIS2_ENV_CHECK(env, NULL);
info_impl = AXIS2_INTF_TO_IMPL(phases_info);
- op_out_faultphases = axis2_array_list_create(env, 20);
+ op_out_faultphases = axis2_array_list_create(env, 0);
+ if(!op_out_faultphases)
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
+
if(!info_impl->out_faultphases)
{
- return op_out_faultphases;
+ return NULL;
}
size = AXIS2_ARRAY_LIST_SIZE(info_impl->out_faultphases, env);
+ if(0 == size)
+ return NULL;
for (i = 0; i < size; i++)
{
phase_name = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(info_impl->out_faultphases, env, i);
@@ -513,19 +535,31 @@
op_in_phases = axis2_phases_info_get_op_in_phases(phases_info, env);
if(NULL == op_in_phases)
- return AXIS2_FAILURE;
+ {
+ status = AXIS2_ERROR_GET_STATUS_CODE((*env)->error);
+ return status;
+ }
op_out_phases = axis2_phases_info_get_op_out_phases(phases_info, env);
if(NULL == op_out_phases)
- return AXIS2_FAILURE;
+ {
+ status = AXIS2_ERROR_GET_STATUS_CODE((*env)->error);
+ return status;
+ }
op_in_faultphases = axis2_phases_info_get_op_in_faultphases(phases_info, env);
if(NULL == op_in_faultphases)
- return AXIS2_FAILURE;
+ {
+ status = AXIS2_ERROR_GET_STATUS_CODE((*env)->error);
+ return status;
+ }
op_out_faultphases = axis2_phases_info_get_op_out_faultphases(phases_info, env);
if(NULL == op_out_faultphases)
- return AXIS2_FAILURE;
+ {
+ status = AXIS2_ERROR_GET_STATUS_CODE((*env)->error);
+ return status;
+ }
status = AXIS2_OP_SET_REMAINING_PHASES_INFLOW(axis2_opt, env, op_in_phases);
if(AXIS2_FAILURE == status)
Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/conf.c?rev=380030&r1=380029&r2=380030&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Wed Feb 22 18:37:16 2006
@@ -296,6 +296,7 @@
axis2_conf_impl_t *config_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
axis2_phase_t *phase = NULL;
+
AXIS2_ENV_CHECK(env, NULL);
config_impl = (axis2_conf_impl_t *) AXIS2_MALLOC ((*env)->allocator
@@ -572,24 +573,12 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
config_impl = AXIS2_INTF_TO_IMPL(conf);
- if(NULL != conf->ops)
- {
- AXIS2_FREE((*env)->allocator, conf->ops);
- conf->ops = NULL;
- }
-
if(NULL != conf->param_container)
{
AXIS2_PARAM_CONTAINER_FREE(conf->param_container, env);
conf->param_container = NULL;
}
-
- if(NULL != config_impl->dep_engine)
- {
- AXIS2_PARAM_CONTAINER_FREE(config_impl->dep_engine, env);
- config_impl->dep_engine= NULL;
- }
-
+
if(config_impl->svc_grps)
{
axis2_hash_index_t *hi = NULL;
@@ -805,8 +794,24 @@
axis2_hash_free(config_impl->faulty_modules, env);
config_impl->faulty_modules = NULL;
}
- AXIS2_FREE((*env)->allocator, config_impl);
- config_impl = NULL;
+
+ if(NULL != config_impl->dep_engine)
+ {
+ AXIS2_DEP_ENGINE_FREE(config_impl->dep_engine, env);
+ config_impl->dep_engine= NULL;
+ }
+
+ if(NULL != conf->ops)
+ {
+ AXIS2_FREE((*env)->allocator, conf->ops);
+ conf->ops = NULL;
+ }
+
+ if(config_impl)
+ {
+ AXIS2_FREE((*env)->allocator, config_impl);
+ config_impl = NULL;
+ }
return status;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/receiver/Makefile.am?rev=380030&r1=380029&r2=380030&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/Makefile.am Wed Feb 22 18:37:16 2006
@@ -1,6 +1,6 @@
TESTS =
lib_LTLIBRARIES = libaxis2_http_receiver.la
-libaxis2_http_receiver_LDADD= -laxis2_unix
+libaxis2_http_receiver_la_LIBADD= -laxis2_unix
libaxis2_http_receiver_la_SOURCES = simple_http_svr_conn.c\
http_response_writer.c\
http_svr_thread.c\
Modified: webservices/axis2/trunk/c/modules/util/property.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/property.c?rev=380030&r1=380029&r2=380030&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/property.c (original)
+++ webservices/axis2/trunk/c/modules/util/property.c Wed Feb 22 18:37:16 2006
@@ -101,7 +101,7 @@
if(property_impl->value)
{
- if(property_impl->scope != AXIS2_SCOPE_REQUEST)
+ if(property_impl->scope == AXIS2_SCOPE_REQUEST)
{
if(property_impl->free_func)
{
Modified: webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/core/deployment/test_deployment.c?rev=380030&r1=380029&r2=380030&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/test_deployment.c (original)
+++ webservices/axis2/trunk/c/test/core/deployment/test_deployment.c Wed Feb 22 18:37:16 2006
@@ -111,6 +111,7 @@
{
printf("dep engine load is successfull\n");
}
+ AXIS2_CONF_FREE(conf, &env);
return 0;
}