You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2005/12/16 05:08:11 UTC
svn commit: r357115 [1/3] - in /webservices/axis2/trunk/c: include/
modules/core/deployment/src/ modules/core/description/src/
modules/core/engine/src/ modules/core/phaseresolver/src/
modules/core/transport/http/src/ modules/util/src/ modules/wsdl/src/...
Author: damitha
Date: Thu Dec 15 20:06:29 2005
New Revision: 357115
URL: http://svn.apache.org/viewcvs?rev=357115&view=rev
Log:
Fixed a bug in AXIS2_ERROR_SET macro. Modified all affected files
Added:
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children_with_specific_attribute_iterator.c
- copied, changed from r357112, webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children__with_specific_attribute_iterator.c
Removed:
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children__with_specific_attribute_iterator.c
Modified:
webservices/axis2/trunk/c/include/axis2.h
webservices/axis2/trunk/c/include/axis2_wsdl_interface.h
webservices/axis2/trunk/c/modules/core/deployment/src/phases_info.c
webservices/axis2/trunk/c/modules/core/description/src/flow.c
webservices/axis2/trunk/c/modules/core/description/src/flow_container.c
webservices/axis2/trunk/c/modules/core/description/src/handler_desc.c
webservices/axis2/trunk/c/modules/core/description/src/module_desc.c
webservices/axis2/trunk/c/modules/core/description/src/op.c
webservices/axis2/trunk/c/modules/core/description/src/param_container.c
webservices/axis2/trunk/c/modules/core/description/src/svc.c
webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c
webservices/axis2/trunk/c/modules/core/description/src/transport_in_desc.c
webservices/axis2/trunk/c/modules/core/description/src/transport_out_desc.c
webservices/axis2/trunk/c/modules/core/engine/src/conf.c
webservices/axis2/trunk/c/modules/core/engine/src/msg_recv.c
webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_holder.c
webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_resolver.c
webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_header.c
webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_request_line.c
webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_response_writer.c
webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_simple_request.c
webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_simple_response.c
webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_status_line.c
webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_simple_http_svr_conn.c
webservices/axis2/trunk/c/modules/util/src/array_list.c
webservices/axis2/trunk/c/modules/util/src/linked_list.c
webservices/axis2/trunk/c/modules/util/src/qname.c
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding.c
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_fault.c
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_msg_ref.c
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_op.c
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_component.c
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_endpoint.c
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_extensible_component.c
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_extensible_element.c
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_fault_ref.c
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_feature.c
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_interface.c
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_msg_ref.c
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_op.c
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_property.c
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_soap_op.c
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_svc.c
webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_child_element_iterator.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children_iterator.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children_qname_iterator.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c
webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_reader_wrapper.c
webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_writer_wrapper.c
webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_reader_wrapper.c
webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c
webservices/axis2/trunk/c/test/unit/core/description/description_test.c
webservices/axis2/trunk/c/test/unit/core/description/test_op.c
webservices/axis2/trunk/c/test/unit/core/description/test_svc.c
webservices/axis2/trunk/c/test/unit/core/description/test_svc.h
webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_resolver.c
Modified: webservices/axis2/trunk/c/include/axis2.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2.h?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2.h (original)
+++ webservices/axis2/trunk/c/include/axis2.h Thu Dec 15 20:06:29 2005
@@ -78,11 +78,10 @@
* @return If function return a status code return AXIS2_SUCCESS. Else if
* function return a type pointer return NULL
*/
-#define AXIS2_ERROR_SET(error, error_number, error_return) \
+#define AXIS2_ERROR_SET(error, error_number, status_code) \
{ \
AXIS2_ERROR_SET_ERROR_NUMBER(error, error_number); \
- AXIS2_ERROR_SET_STATUS_CODE(error, AXIS2_FAILURE); \
- return error_return; \
+ AXIS2_ERROR_SET_STATUS_CODE(error, status_code); \
}
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_interface.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_interface.h?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_interface.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_interface.h Thu Dec 15 20:06:29 2005
@@ -218,7 +218,7 @@
{
axis2_wsdl_interface_ops_t *ops;
struct axis2_wsdl_extensible_component *extensible_component;
- axis2_op_type_t optr_type; /*0-wsdl_op, 1-axis2_op */
+ axis2_op_type_t op_type; /*0-wsdl_op, 1-axis2_op */
};
/**
@@ -265,8 +265,8 @@
#define AXIS2_WSDL_INTERFACE_SET_OPS(wsdl_interface, env, list) \
((wsdl_interface->ops)->set_ops (wsdl_interface, env, list))
-#define AXIS2_WSDL_INTERFACE_SET_OP(wsdl_interface, env, op, optr_type) \
- ((wsdl_interface->ops)->set_op (wsdl_interface, env, op, optr_type))
+#define AXIS2_WSDL_INTERFACE_SET_OP(wsdl_interface, env, op, op_type) \
+ ((wsdl_interface->ops)->set_op (wsdl_interface, env, op, op_type))
#define AXIS2_WSDL_INTERFACE_SET_SUPER_INTERFACES(wsdl_interface, env, list) \
((wsdl_interface->ops)->set_super_interfaces (wsdl_interface, env, list))
Modified: webservices/axis2/trunk/c/modules/core/deployment/src/phases_info.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/src/phases_info.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/src/phases_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/src/phases_info.c Thu Dec 15 20:06:29 2005
@@ -93,7 +93,8 @@
if(NULL == phases_info_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
phases_info_impl->in_phases = NULL;
@@ -108,7 +109,8 @@
{
AXIS2_FREE ((*env)->allocator, phases_info_impl);
phases_info_impl = NULL;
- AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
phases_info_impl->phases_info.ops->free = axis2_phases_info_free;
Modified: webservices/axis2/trunk/c/modules/core/description/src/flow.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/flow.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/flow.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/flow.c Thu Dec 15 20:06:29 2005
@@ -27,6 +27,7 @@
* Field list
*/
axis2_array_list_t *list;
+
} axis2_flow_impl_t;
#define AXIS2_INTF_TO_IMPL(flow) ((axis2_flow_impl_t *)(flow))
@@ -60,30 +61,37 @@
allocator, sizeof(axis2_flow_impl_t));
if(NULL == flow_impl)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
+ flow_impl->list = NULL;
+ flow_impl->flow.ops = NULL;
+
+ /*Create the list with the default size of 16 */
+ flow_impl->list = axis2_array_list_create (env, 0);
+ if(NULL == flow_impl->list)
+ {
+ axis2_flow_free(&(flow_impl->flow), env);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
+
flow_impl->flow.ops =
AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_flow_ops_t));
if(NULL == flow_impl->flow.ops)
{
- AXIS2_FREE((*env)->allocator, flow_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ axis2_flow_free(&(flow_impl->flow), env);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
flow_impl->flow.ops->free = axis2_flow_free;
flow_impl->flow.ops->add_handler = axis2_flow_add_handler;
flow_impl->flow.ops->get_handler = axis2_flow_get_handler;
flow_impl->flow.ops->get_handler_count = axis2_flow_get_handler_count;
-
- /*Create the list with the default size of 16 */
- flow_impl->list = axis2_array_list_create (env, 0);
- if(NULL == flow_impl->list)
- {
- AXIS2_FREE((*env)->allocator, flow_impl->flow.ops);
- AXIS2_FREE((*env)->allocator, flow_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
- }
-
+
return &(flow_impl->flow);
}
@@ -110,9 +118,23 @@
axis2_env_t **env,
axis2_handler_desc_t *handler)
{
+ axis2_flow_impl_t *flow_impl = NULL;
+
AXIS2_FUNC_PARAM_CHECK(flow, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, handler, AXIS2_FAILURE);
+
+ flow_impl = AXIS2_INTF_TO_IMPL(flow);
+ if(!flow_impl->list)
+ {
+ flow_impl->list = axis2_array_list_create (env, 0);
+ if(NULL == flow_impl->list)
+ {
+ axis2_flow_free(&(flow_impl->flow), env);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return AXIS2_FAILURE;
+ }
+ }
return AXIS2_ARRAY_LIST_ADD(AXIS2_INTF_TO_IMPL(flow)->list, env, handler);
}
Modified: webservices/axis2/trunk/c/modules/core/description/src/flow_container.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/flow_container.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/flow_container.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/flow_container.c Thu Dec 15 20:06:29 2005
@@ -90,22 +90,33 @@
axis2_flow_container_t * AXIS2_CALL
axis2_flow_container_create (axis2_env_t **env)
{
+ axis2_flow_container_impl_t *flow_container_impl = NULL;
+
AXIS2_ENV_CHECK(env, NULL);
- axis2_flow_container_impl_t *flow_container_impl =
- (axis2_flow_container_impl_t *) AXIS2_MALLOC((*env)->allocator,
- sizeof(axis2_flow_container_impl_t));
+ flow_container_impl = (axis2_flow_container_impl_t *) AXIS2_MALLOC((*env)->
+ allocator, sizeof(axis2_flow_container_impl_t));
if(NULL == flow_container_impl)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
-
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
+
+ flow_container_impl->flow_container.ops = NULL;
+ flow_container_impl->in = NULL;
+ flow_container_impl->out = NULL;
+ flow_container_impl->in_fault = NULL;
+ flow_container_impl->out_fault = NULL;
+
flow_container_impl->flow_container.ops =
AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_flow_container_ops_t));
if(NULL == flow_container_impl->flow_container.ops)
{
- AXIS2_FREE((*env)->allocator, flow_container_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ axis2_flow_container_free(&(flow_container_impl->flow_container), env);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
flow_container_impl->flow_container.ops->free = axis2_flow_container_free;
@@ -125,22 +136,6 @@
axis2_flow_container_get_fault_outflow;
flow_container_impl->flow_container.ops->set_fault_outflow =
axis2_flow_container_set_fault_outflow;
-
-
- flow_container_impl->in = axis2_flow_create(env);
- flow_container_impl->out = axis2_flow_create(env);
- flow_container_impl->in_fault = axis2_flow_create(env);
- flow_container_impl->out_fault = axis2_flow_create(env);
-
- if(NULL == flow_container_impl->in || NULL == flow_container_impl->out
- || NULL == flow_container_impl->in_fault
- || NULL == flow_container_impl->out_fault)
- {
- AXIS2_FLOW_FREE(flow_container_impl->in, env);
- AXIS2_FLOW_FREE(flow_container_impl->out, env);
- AXIS2_FLOW_FREE(flow_container_impl->in_fault, env);
- AXIS2_FLOW_FREE(flow_container_impl->out_fault, env);
- }
return &(flow_container_impl->flow_container);
}
@@ -194,8 +189,16 @@
axis2_env_t **env,
axis2_flow_t *inflow)
{
+ axis2_flow_container_impl_t *container_impl = NULL;
+
AXIS2_FUNC_PARAM_CHECK(flow_container, env, AXIS2_FAILURE);
- AXIS2_INTF_TO_IMPL(flow_container)->in = inflow;
+ container_impl = AXIS2_INTF_TO_IMPL(flow_container);
+ if(container_impl->in)
+ {
+ AXIS2_FLOW_FREE(container_impl->in, env);
+ container_impl->in = NULL;
+ }
+ container_impl->in = inflow;
return AXIS2_SUCCESS;
}
@@ -220,8 +223,17 @@
axis2_env_t **env,
axis2_flow_t *outflow)
{
+ axis2_flow_container_impl_t *container_impl = NULL;
+
AXIS2_FUNC_PARAM_CHECK(flow_container, env, AXIS2_FAILURE);
- AXIS2_INTF_TO_IMPL(flow_container)->out = outflow;
+
+ container_impl = AXIS2_INTF_TO_IMPL(flow_container);
+ if(container_impl->out)
+ {
+ AXIS2_FLOW_FREE(container_impl->out, env);
+ container_impl->out = NULL;
+ }
+ container_impl->out = outflow;
return AXIS2_SUCCESS;
}
@@ -246,8 +258,16 @@
axis2_env_t **env,
axis2_flow_t *falut_inflow)
{
+ axis2_flow_container_impl_t *container_impl = NULL;
+
AXIS2_FUNC_PARAM_CHECK(flow_container, env, AXIS2_FAILURE);
- AXIS2_INTF_TO_IMPL(flow_container)->in_fault = falut_inflow;
+ container_impl = AXIS2_INTF_TO_IMPL(flow_container);
+ if(container_impl->in_fault)
+ {
+ AXIS2_FLOW_FREE(container_impl->in_fault, env);
+ container_impl->in_fault = NULL;
+ }
+ container_impl->in_fault = falut_inflow;
return AXIS2_SUCCESS;
}
@@ -272,9 +292,16 @@
axis2_env_t **env,
axis2_flow_t *fault_outflow)
{
+ axis2_flow_container_impl_t *container_impl = NULL;
+
AXIS2_FUNC_PARAM_CHECK(flow_container, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, fault_outflow, AXIS2_FAILURE);
-
- AXIS2_INTF_TO_IMPL(flow_container)->out_fault = fault_outflow;
+ container_impl = AXIS2_INTF_TO_IMPL(flow_container);
+ if(container_impl->out_fault)
+ {
+ AXIS2_FLOW_FREE(container_impl->out_fault, env);
+ container_impl->out_fault = NULL;
+ }
+ container_impl->out_fault = fault_outflow;
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/description/src/handler_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/handler_desc.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/handler_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/handler_desc.c Thu Dec 15 20:06:29 2005
@@ -81,8 +81,7 @@
handler_desc_impl = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_handler_desc_impl_t) );
if (!handler_desc_impl)
{
- AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_NO_MEMORY);
- AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -119,9 +118,8 @@
handler_desc_impl->handler_desc.ops = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_handler_desc_ops_t) );
if (!handler_desc_impl->handler_desc.ops)
{
- AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_NO_MEMORY);
- AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
axis2_handler_desc_free(&(handler_desc_impl->handler_desc), env);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -216,8 +214,7 @@
if (AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(handler_desc_impl->parent_param_container, env, AXIS2_PARAM_GET_NAME(param, env)) )
{
- AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE);
- AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET((*env)->error,AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE , AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -308,8 +305,7 @@
handler_desc_impl->class_name = AXIS2_STRDUP(class_name, env);
if (!handler_desc_impl->class_name)
{
- AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_NO_MEMORY);
- AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
}
Modified: webservices/axis2/trunk/c/modules/core/description/src/module_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/module_desc.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/module_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/module_desc.c Thu Dec 15 20:06:29 2005
@@ -140,7 +140,7 @@
if(NULL == module_desc_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -154,7 +154,7 @@
if(NULL == module_desc_impl->module_desc.params)
{
axis2_module_desc_free(&(module_desc_impl->module_desc), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -162,7 +162,7 @@
if(NULL == module_desc_impl->module_desc.flow_container)
{
axis2_module_desc_free(&(module_desc_impl->module_desc), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE)
return NULL;
}
@@ -170,16 +170,16 @@
if(NULL == module_desc_impl->ops)
{
axis2_module_desc_free(&(module_desc_impl->module_desc), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
-
+
module_desc_impl->module_desc.ops =
AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_module_desc_ops_t));
if(NULL == module_desc_impl->module_desc.ops)
{
axis2_module_desc_free(&(module_desc_impl->module_desc), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -231,7 +231,10 @@
axis2_module_desc_impl_t *module_desc_impl =
AXIS2_INTF_TO_IMPL(axis2_module_desc_create(env));
if(NULL == module_desc_impl)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
module_desc_impl->qname = qname;
@@ -536,14 +539,14 @@
axis2_bool_t ret_state = AXIS2_FALSE;
axis2_param_t *param_l = NULL;
- AXIS2_FUNC_PARAM_CHECK(module_desc, env, AXIS2_FALSE);
- AXIS2_PARAM_CHECK((*env)->error, param_name, AXIS2_FALSE);
+ AXIS2_FUNC_PARAM_CHECK(module_desc, env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, param_name, AXIS2_FAILURE);
module_desc_impl = AXIS2_INTF_TO_IMPL(module_desc);
/* checking the locked value of parent*/
if(NULL == module_desc_impl->parent)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_MODULE_DESC, AXIS2_FALSE);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_MODULE_DESC, AXIS2_FAILURE);
return AXIS2_FALSE;
}
locked = AXIS2_CONF_IS_PARAM_LOCKED(module_desc_impl->parent, env, param_name);
Modified: webservices/axis2/trunk/c/modules/core/description/src/op.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/op.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/op.c Thu Dec 15 20:06:29 2005
@@ -318,7 +318,8 @@
if(NULL == op_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
op_impl->parent = NULL;
@@ -338,7 +339,7 @@
if(NULL == op_impl->op.param_container)
{
axis2_op_free(&(op_impl->op), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -347,7 +348,7 @@
if(NULL == op_impl->op.wsdl_op)
{
axis2_op_free(&(op_impl->op), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -405,7 +406,7 @@
if(NULL == op_impl->op.ops)
{
axis2_op_free(&(op_impl->op), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -482,7 +483,7 @@
if(NULL == op_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -492,7 +493,7 @@
if(NULL == op_impl->op.wsdl_op)
{
axis2_op_free(&(op_impl->op), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
}
@@ -503,7 +504,7 @@
axis2_op_free(&(op_impl->op), env);
return NULL;
}
- printf("status:%d\n", status);
+
return &(op_impl->op);
}
@@ -519,7 +520,7 @@
if(NULL == op_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -1472,7 +1473,7 @@
op_ctx = axis2_op_ctx_create(env, op, svc_ctx);
if(!op_ctx)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
}
@@ -1488,7 +1489,8 @@
op_ctx = AXIS2_CONF_CTX_GET_OP_CTX(conf_ctx, env, value);
if(NULL == op_ctx)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_CANNOT_CORRELATE_MSG, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_CANNOT_CORRELATE_MSG,
+ AXIS2_FAILURE);
return NULL;
}
}
@@ -1536,7 +1538,8 @@
if (NULL == op_ctx)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_CANNOT_CORRELATE_MSG, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_CANNOT_CORRELATE_MSG,
+ AXIS2_FAILURE);
return NULL;
}
}
Modified: webservices/axis2/trunk/c/modules/core/description/src/param_container.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/param_container.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/param_container.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/param_container.c Thu Dec 15 20:06:29 2005
@@ -67,7 +67,10 @@
allocator, sizeof(axis2_param_container_impl_t));
if(NULL == param_container_impl)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
param_container_impl->params = NULL;
@@ -75,8 +78,8 @@
if(NULL == param_container_impl->params)
{
axis2_param_container_free(&(param_container_impl->param_container), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
- return AXIS2_FAILURE;
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
param_container_impl->param_container.ops =
@@ -84,8 +87,8 @@
if(NULL == param_container_impl->param_container.ops)
{
axis2_param_container_free(&(param_container_impl->param_container), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
- return AXIS2_FAILURE;
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
param_container_impl->param_container.ops->free = axis2_param_container_free;
Modified: webservices/axis2/trunk/c/modules/core/description/src/svc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/svc.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/svc.c Thu Dec 15 20:06:29 2005
@@ -261,7 +261,7 @@
AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_svc_impl_t));
if(NULL == svc_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -278,7 +278,7 @@
if(NULL == svc_impl->svc.param_container)
{
axis2_svc_free(&(svc_impl->svc), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -286,7 +286,7 @@
if(NULL == svc_impl->svc.flow_container)
{
axis2_svc_free(&(svc_impl->svc), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -294,7 +294,7 @@
if(NULL == svc_impl->svc.wsdl_svc)
{
axis2_svc_free(&(svc_impl->svc), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -302,7 +302,7 @@
if(NULL == svc_impl->wasaction_opeartionmap)
{
axis2_svc_free(&(svc_impl->svc), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -311,7 +311,7 @@
if(NULL == svc_impl->module_list)
{
axis2_svc_free(&(svc_impl->svc), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -319,7 +319,7 @@
if(NULL == svc_impl->svc.ops)
{
axis2_svc_free(&(svc_impl->svc), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -327,7 +327,7 @@
if(NULL == wsdl_interface_l)
{
axis2_svc_free(&(svc_impl->svc), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -342,7 +342,7 @@
if(NULL == param_container_l)
{
axis2_svc_free(&(svc_impl->svc), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -358,7 +358,7 @@
if(NULL == array_list_l)
{
axis2_svc_free(&(svc_impl->svc), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -469,7 +469,7 @@
svc_impl = AXIS2_INTF_TO_IMPL(axis2_svc_create(env));
if(NULL == svc_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -495,7 +495,7 @@
if(NULL == svc_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
if(NULL != svc_impl->svc.wsdl_svc)
@@ -894,7 +894,7 @@
map = AXIS2_MODULE_DESC_GET_OPS(module_desc, env);
pr = axis2_phase_resolver_create_with_config_and_svc(env, axis2_config, svc);
- printf("came1\n");
+
if(!pr)
{
return AXIS2_FAILURE;
@@ -903,7 +903,6 @@
for (index = axis2_hash_first (map, env); index; index =
axis2_hash_next (env, index))
{
- printf("came2\n");
int size = 0;
int j = 0;
void *v = NULL;
@@ -912,7 +911,7 @@
params = AXIS2_OP_GET_PARAMS(axis2_opt, env);
/* Adding wsa-maping into service */
size = AXIS2_ARRAY_LIST_SIZE(params, env);
- printf("size:%d\n", size);
+
if(AXIS2_TRUE != AXIS2_ERROR_GET_STATUS_CODE((*env)->error))
{
if(pr)
@@ -935,9 +934,9 @@
}
}
- printf("came3\n");
+
status = AXIS2_PHASE_RESOLVER_BUILD_MODULE_OP(pr, env, axis2_opt);
- printf("came4\n");
+
if(AXIS2_FAILURE == status)
{
if(pr)
@@ -948,7 +947,7 @@
status = axis2_svc_add_op(svc, env, axis2_opt);
}
- printf("came5\n");
+
if(pr)
AXIS2_PHASE_RESOLVER_FREE(pr, env);
return status;
Modified: webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c Thu Dec 15 20:06:29 2005
@@ -147,7 +147,10 @@
AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_svc_grp_impl_t));
if(NULL == svc_grp_impl)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
svc_grp_impl->svc_grp.param_container = NULL;
svc_grp_impl->modules = NULL;
@@ -161,7 +164,7 @@
if(NULL == svc_grp_impl->svc_grp.param_container)
{
axis2_svc_grp_free(&(svc_grp_impl->svc_grp), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -169,7 +172,7 @@
if(NULL == svc_grp_impl->modules)
{
axis2_svc_grp_free(&(svc_grp_impl->svc_grp), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -177,7 +180,7 @@
if(NULL == svc_grp_impl->module_list)
{
axis2_svc_grp_free(&(svc_grp_impl->svc_grp), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -185,7 +188,7 @@
if(NULL == svc_grp_impl->svcs)
{
axis2_svc_grp_free(&(svc_grp_impl->svc_grp), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -194,7 +197,7 @@
if(NULL == svc_grp_impl->svc_grp.ops)
{
AXIS2_FREE((*env)->allocator, svc_grp_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -509,7 +512,8 @@
AXIS2_PARAM_CHECK((*env)->error, name, NULL);
if(NULL == svc_grp->param_container)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_PARAM_CONTAINER, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_PARAM_CONTAINER,
+ AXIS2_FAILURE);
return NULL;
}
Modified: webservices/axis2/trunk/c/modules/core/description/src/transport_in_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/transport_in_desc.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/transport_in_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/transport_in_desc.c Thu Dec 15 20:06:29 2005
@@ -130,6 +130,19 @@
axis2_transport_in_create_with_qname (axis2_env_t **env, axis2_qname_t *qname)
{
axis2_transport_in_desc_impl_t *transport_in_impl = NULL;
+
+ AXIS2_ENV_CHECK(env, NULL);
+ AXIS2_PARAM_CHECK((*env)->error, qname, NULL);
+
+ transport_in_impl = (axis2_transport_in_desc_impl_t *) AXIS2_MALLOC((*env)->
+ allocator, sizeof(axis2_transport_in_desc_impl_t));
+
+ if(NULL == transport_in_impl)
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
+
transport_in_impl->param_container = NULL;
transport_in_impl->qname = NULL;
transport_in_impl->in_phase = NULL;
@@ -137,37 +150,25 @@
transport_in_impl->inflow = NULL;
transport_in_impl->faultflow = NULL;
transport_in_impl->recv = NULL;
- transport_in_impl->transport_in.ops = NULL;
-
-
- AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, qname, NULL);
-
- transport_in_impl = (axis2_transport_in_desc_impl_t *) AXIS2_MALLOC((*env)->
- allocator, sizeof(axis2_transport_in_desc_impl_t));
-
- if(NULL == transport_in_impl)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ transport_in_impl->transport_in.ops = NULL;
transport_in_impl->param_container = axis2_param_container_create(env);
if(NULL == transport_in_impl->param_container)
{
axis2_transport_in_desc_free(&(transport_in_impl->transport_in), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
transport_in_impl->qname = qname;
- transport_in_impl->in_phase = axis2_phase_create(env, AXIS2_TRANSPORT_PHASE);
-
- transport_in_impl->faultphase = axis2_phase_create(env, AXIS2_TRANSPORT_PHASE);
-
transport_in_impl->transport_in.ops =
AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_transport_in_desc_ops_t));
if(NULL == transport_in_impl->transport_in.ops)
{
axis2_transport_in_desc_free(&(transport_in_impl->transport_in), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
transport_in_impl->transport_in.ops->free = axis2_transport_in_desc_free;
@@ -206,29 +207,56 @@
axis2_transport_in_desc_free (axis2_transport_in_desc_t *transport_in,
axis2_env_t **env)
{
- axis2_transport_in_desc_impl_t *transport_in_impl =
- AXIS2_INTF_TO_IMPL(transport_in);
+ axis2_transport_in_desc_impl_t *transport_in_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(transport_in, env, AXIS2_FAILURE);
+ transport_in_impl = AXIS2_INTF_TO_IMPL(transport_in);
+
if(NULL != transport_in->ops)
+ {
AXIS2_FREE((*env)->allocator, transport_in->ops);
+ transport_in->ops = NULL;
+ }
if(NULL != transport_in_impl->param_container)
{
AXIS2_PARAM_CONTAINER_FREE(transport_in_impl->param_container, env);
+ transport_in_impl->param_container = NULL;
}
- if(NULL != transport_in_impl->in_phase)
+ if(NULL != transport_in_impl->qname)
{
- AXIS2_PHASE_FREE(transport_in_impl->in_phase, env);
+ AXIS2_QNAME_FREE(transport_in_impl->qname, env);
+ transport_in_impl->qname = NULL;
}
- if(NULL != transport_in_impl->faultphase)
- {
- AXIS2_PHASE_FREE(transport_in_impl->faultphase, env);
+ if(transport_in_impl->inflow)
+ {
+ AXIS2_FLOW_FREE(transport_in_impl->inflow, env);
+ transport_in_impl->inflow = NULL;
+ }
+
+ if(transport_in_impl->faultflow)
+ {
+ AXIS2_FLOW_FREE(transport_in_impl->faultflow, env);
+ transport_in_impl->faultflow = NULL;
}
+ if(transport_in_impl->in_phase)
+ {
+ AXIS2_FLOW_FREE(transport_in_impl->in_phase, env);
+ transport_in_impl->in_phase = NULL;
+ }
+
+ if(transport_in_impl->faultphase)
+ {
+ AXIS2_FLOW_FREE(transport_in_impl->faultphase, env);
+ transport_in_impl->faultphase = NULL;
+ }
+
+ transport_in_impl->recv = NULL;
+
AXIS2_FREE((*env)->allocator, transport_in_impl);
return AXIS2_SUCCESS;
@@ -247,13 +275,16 @@
axis2_env_t **env,
axis2_qname_t *qname)
{
- axis2_transport_in_desc_impl_t *transport_in_impl = AXIS2_INTF_TO_IMPL(transport_in);
+ axis2_transport_in_desc_impl_t *transport_in_impl = NULL;
+
AXIS2_FUNC_PARAM_CHECK(transport_in, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, qname, AXIS2_FAILURE);
+ transport_in_impl = AXIS2_INTF_TO_IMPL(transport_in);
+
if(transport_in_impl->qname)
{
- AXIS2_PHASE_FREE(transport_in_impl->qname, env);
+ AXIS2_QNAME_FREE(transport_in_impl->qname, env);
transport_in_impl->qname = NULL;
}
transport_in_impl->qname = qname;
@@ -276,6 +307,7 @@
axis2_transport_in_desc_impl_t *transport_in_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(transport_in, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, inflow, AXIS2_FAILURE);
+
transport_in_impl = AXIS2_INTF_TO_IMPL(transport_in);
if(transport_in_impl->inflow)
{
@@ -302,9 +334,10 @@
AXIS2_FUNC_PARAM_CHECK(transport_in, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, faultflow, AXIS2_FAILURE);
+ transport_in_impl = AXIS2_INTF_TO_IMPL(transport_in);
if(transport_in_impl->faultflow)
{
- AXIS2_PHASE_FREE(transport_in_impl->faultflow, env);
+ AXIS2_FLOW_FREE(transport_in_impl->faultflow, env);
transport_in_impl->faultflow = NULL;
}
transport_in_impl->faultflow = faultflow;
@@ -324,15 +357,11 @@
axis2_env_t **env,
struct axis2_transport_listener *recv)
{
- axis2_transport_in_desc_impl_t *transport_in_impl = AXIS2_INTF_TO_IMPL(transport_in);
+ axis2_transport_in_desc_impl_t *transport_in_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(transport_in, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, recv, AXIS2_FAILURE);
-
- if(transport_in_impl->recv)
- {
- AXIS2_TRANSPORT_LISTENER_FREE(transport_in_impl->recv, env);
- transport_in_impl->recv = NULL;
- }
+
+ transport_in_impl = AXIS2_INTF_TO_IMPL(transport_in);
transport_in_impl->recv = recv;
return AXIS2_SUCCESS;
}
@@ -351,17 +380,17 @@
axis2_env_t **env,
struct axis2_phase *in_phase)
{
- axis2_transport_in_desc_impl_t *transport_in_impl = AXIS2_INTF_TO_IMPL(transport_in);
+ axis2_transport_in_desc_impl_t *transport_in_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(transport_in, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, in_phase, AXIS2_FAILURE);
+ transport_in_impl = AXIS2_INTF_TO_IMPL(transport_in);
if(transport_in_impl->in_phase)
{
- AXIS2_PHASE_FREE(transport_in_impl->in_phase, env);
+ AXIS2_FLOW_FREE(transport_in_impl->in_phase, env);
transport_in_impl->in_phase = NULL;
}
-
transport_in_impl->in_phase = in_phase;
return AXIS2_SUCCESS;
}
@@ -380,16 +409,17 @@
axis2_env_t **env,
struct axis2_phase *faultphase)
{
- axis2_transport_in_desc_impl_t *transport_in_impl = AXIS2_INTF_TO_IMPL(transport_in);
+ axis2_transport_in_desc_impl_t *transport_in_impl = NULL;
+
AXIS2_FUNC_PARAM_CHECK(transport_in, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, faultphase, AXIS2_FAILURE);
+ transport_in_impl = AXIS2_INTF_TO_IMPL(transport_in);
if(transport_in_impl->faultphase)
{
- AXIS2_PHASE_FREE(transport_in_impl->faultphase, env);
+ AXIS2_FLOW_FREE(transport_in_impl->faultphase, env);
transport_in_impl->faultphase = NULL;
}
-
transport_in_impl->faultphase = faultphase;
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/description/src/transport_out_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/transport_out_desc.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/transport_out_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/transport_out_desc.c Thu Dec 15 20:06:29 2005
@@ -130,6 +130,19 @@
axis2_transport_out_create_with_qname (axis2_env_t **env, axis2_qname_t *qname)
{
axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
+
+ AXIS2_ENV_CHECK(env, NULL);
+ AXIS2_PARAM_CHECK((*env)->error, qname, NULL);
+
+ transport_out_impl = (axis2_transport_out_desc_impl_t *) AXIS2_MALLOC((*env)->
+ allocator, sizeof(axis2_transport_out_desc_impl_t));
+
+ if(NULL == transport_out_impl)
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
+
transport_out_impl->param_container = NULL;
transport_out_impl->qname = NULL;
transport_out_impl->out_phase = NULL;
@@ -139,35 +152,23 @@
transport_out_impl->sender = NULL;
transport_out_impl->transport_out.ops = NULL;
-
- AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, qname, NULL);
-
- transport_out_impl = (axis2_transport_out_desc_impl_t *) AXIS2_MALLOC((*env)->
- allocator, sizeof(axis2_transport_out_desc_impl_t));
-
- if(NULL == transport_out_impl)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
-
transport_out_impl->param_container = axis2_param_container_create(env);
if(NULL == transport_out_impl->param_container)
{
axis2_transport_out_desc_free(&(transport_out_impl->transport_out), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
transport_out_impl->qname = qname;
- transport_out_impl->out_phase = axis2_phase_create(env, AXIS2_TRANSPORT_PHASE);
-
- transport_out_impl->faultphase = axis2_phase_create(env, AXIS2_TRANSPORT_PHASE);
-
transport_out_impl->transport_out.ops =
AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_transport_out_desc_ops_t));
if(NULL == transport_out_impl->transport_out.ops)
{
axis2_transport_out_desc_free(&(transport_out_impl->transport_out), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
transport_out_impl->transport_out.ops->free = axis2_transport_out_desc_free;
@@ -206,29 +207,56 @@
axis2_transport_out_desc_free (axis2_transport_out_desc_t *transport_out,
axis2_env_t **env)
{
- axis2_transport_out_desc_impl_t *transport_out_impl =
- AXIS2_INTF_TO_IMPL(transport_out);
+ axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(transport_out, env, AXIS2_FAILURE);
+ transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
+
if(NULL != transport_out->ops)
+ {
AXIS2_FREE((*env)->allocator, transport_out->ops);
+ transport_out->ops = NULL;
+ }
if(NULL != transport_out_impl->param_container)
{
AXIS2_PARAM_CONTAINER_FREE(transport_out_impl->param_container, env);
+ transport_out_impl->param_container = NULL;
}
- if(NULL != transport_out_impl->out_phase)
+ if(NULL != transport_out_impl->qname)
{
- AXIS2_PHASE_FREE(transport_out_impl->out_phase, env);
+ AXIS2_QNAME_FREE(transport_out_impl->qname, env);
+ transport_out_impl->qname = NULL;
}
- if(NULL != transport_out_impl->faultphase)
- {
- AXIS2_PHASE_FREE(transport_out_impl->faultphase, env);
+ if(transport_out_impl->outflow)
+ {
+ AXIS2_FLOW_FREE(transport_out_impl->outflow, env);
+ transport_out_impl->outflow = NULL;
}
+ if(transport_out_impl->faultflow)
+ {
+ AXIS2_FLOW_FREE(transport_out_impl->faultflow, env);
+ transport_out_impl->faultflow = NULL;
+ }
+
+ if(transport_out_impl->out_phase)
+ {
+ AXIS2_FLOW_FREE(transport_out_impl->out_phase, env);
+ transport_out_impl->out_phase = NULL;
+ }
+
+ if(transport_out_impl->faultphase)
+ {
+ AXIS2_FLOW_FREE(transport_out_impl->faultphase, env);
+ transport_out_impl->faultphase = NULL;
+ }
+
+ transport_out_impl->sender = NULL;
+
AXIS2_FREE((*env)->allocator, transport_out_impl);
return AXIS2_SUCCESS;
@@ -276,6 +304,7 @@
axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(transport_out, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, outflow, AXIS2_FAILURE);
+
transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
if(transport_out_impl->outflow)
{
@@ -298,13 +327,14 @@
axis2_env_t **env,
struct axis2_flow *faultflow)
{
- axis2_transport_out_desc_impl_t *transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
+ axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(transport_out, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, faultflow, AXIS2_FAILURE);
+ transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
if(transport_out_impl->faultflow)
{
- AXIS2_PHASE_FREE(transport_out_impl->faultflow, env);
+ AXIS2_FLOW_FREE(transport_out_impl->faultflow, env);
transport_out_impl->faultflow = NULL;
}
transport_out_impl->faultflow = faultflow;
@@ -324,15 +354,12 @@
axis2_env_t **env,
struct axis2_transport_sender *sender)
{
- axis2_transport_out_desc_impl_t *transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
+ axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(transport_out, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, sender, AXIS2_FAILURE);
- if(transport_out_impl->sender)
- {
- AXIS2_TRANSPORT_SENDER_FREE(transport_out_impl->sender, env);
- transport_out_impl->sender = NULL;
- }
+ transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
+
transport_out_impl->sender = sender;
return AXIS2_SUCCESS;
}
@@ -351,17 +378,17 @@
axis2_env_t **env,
struct axis2_phase *out_phase)
{
- axis2_transport_out_desc_impl_t *transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
+ axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
AXIS2_FUNC_PARAM_CHECK(transport_out, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, out_phase, AXIS2_FAILURE);
+ transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
if(transport_out_impl->out_phase)
{
- AXIS2_PHASE_FREE(transport_out_impl->out_phase, env);
+ AXIS2_FLOW_FREE(transport_out_impl->out_phase, env);
transport_out_impl->out_phase = NULL;
}
-
transport_out_impl->out_phase = out_phase;
return AXIS2_SUCCESS;
}
@@ -380,16 +407,17 @@
axis2_env_t **env,
struct axis2_phase *faultphase)
{
- axis2_transport_out_desc_impl_t *transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
+ axis2_transport_out_desc_impl_t *transport_out_impl = NULL;
+
AXIS2_FUNC_PARAM_CHECK(transport_out, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, faultphase, AXIS2_FAILURE);
+ transport_out_impl = AXIS2_INTF_TO_IMPL(transport_out);
if(transport_out_impl->faultphase)
{
- AXIS2_PHASE_FREE(transport_out_impl->faultphase, env);
+ AXIS2_FLOW_FREE(transport_out_impl->faultphase, env);
transport_out_impl->faultphase = NULL;
}
-
transport_out_impl->faultphase = faultphase;
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/engine/src/conf.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/conf.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/conf.c Thu Dec 15 20:06:29 2005
@@ -264,7 +264,7 @@
if(NULL == config_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -290,7 +290,7 @@
if(NULL == config_impl->conf.param_container)
{
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -298,7 +298,7 @@
if(NULL == config_impl->transports_in)
{
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -306,7 +306,7 @@
if(NULL == config_impl->transports_out)
{
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -314,7 +314,7 @@
if(NULL == config_impl->modules)
{
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -322,7 +322,7 @@
if(NULL == config_impl->engaged_modules)
{
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -331,7 +331,7 @@
if(NULL == config_impl->in_phases_upto_and_including_post_dispatch)
{
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
else
@@ -369,7 +369,7 @@
if(NULL == config_impl->out_phases)
{
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -377,7 +377,7 @@
if(NULL == config_impl->in_faultphases)
{
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -385,7 +385,7 @@
if(NULL == config_impl->out_faultphases)
{
axis2_conf_free(&(config_impl->conf), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -841,7 +841,8 @@
config_impl = AXIS2_INTF_TO_IMPL(conf);
if(!config_impl->svc_grps)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_CONF, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_CONF,
+ AXIS2_FAILURE);
return NULL;
}
return (struct axis2_svc_grp *) (axis2_hash_get (config_impl->svc_grps,
@@ -951,13 +952,14 @@
if(AXIS2_TRUE == axis2_conf_is_param_locked(conf, env,
AXIS2_PARAM_GET_NAME(param, env)))
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE,
- AXIS2_FAILURE);
+ AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
else
{
- status = AXIS2_PARAM_CONTAINER_ADD_PARAM(conf->param_container, env, param);
+ status = AXIS2_PARAM_CONTAINER_ADD_PARAM(conf->param_container, env,
+ param);
}
return status;
}
@@ -973,7 +975,7 @@
if(NULL == conf->param_container)
{
AXIS2_ERROR_SET((*env)->error,
- AXIS2_ERROR_INVALID_STATE_PARAM_CONTAINER, NULL);
+ AXIS2_ERROR_INVALID_STATE_PARAM_CONTAINER, AXIS2_FAILURE);
return NULL;
}
@@ -1016,8 +1018,8 @@
config_impl = AXIS2_INTF_TO_IMPL(conf);
- return (struct axis2_transport_in_desc *) axis2_hash_get(config_impl->transports_in,
- qname, sizeof(axis2_qname_t));
+ return (struct axis2_transport_in_desc *) axis2_hash_get(config_impl->
+ transports_in, qname, sizeof(axis2_qname_t));
}
/**
@@ -1063,8 +1065,8 @@
config_impl = AXIS2_INTF_TO_IMPL(conf);
- return (struct axis2_transport_out_desc *) axis2_hash_get(config_impl->transports_out,
- qname, sizeof(axis2_qname_t));
+ return (struct axis2_transport_out_desc *) axis2_hash_get(config_impl->
+ transports_out, qname, sizeof(axis2_qname_t));
}
/**
Modified: webservices/axis2/trunk/c/modules/core/engine/src/msg_recv.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/msg_recv.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/msg_recv.c Thu Dec 15 20:06:29 2005
@@ -36,7 +36,7 @@
axis2_status_t AXIS2_CALL
axis2_msg_recv_receive (axis2_msg_recv_t *msg_recv,
axis2_env_t **env,
- struct axis2_msg_ctx_s *msg_ctx);
+ struct axis2_msg_ctx *msg_ctx);
/************************* End of function headers ****************************/
@@ -52,7 +52,7 @@
if(NULL == msg_recv_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -64,7 +64,7 @@
if(NULL == msg_recv_impl->msg_recv.ops)
{
axis2_msg_recv_free(&(msg_recv_impl->msg_recv), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -91,7 +91,7 @@
axis2_status_t AXIS2_CALL
axis2_msg_receive (axis2_msg_recv_t *msg_recv,
axis2_env_t **env,
- struct axis2_msg_ctx_s *msg_ctx)
+ struct axis2_msg_ctx *msg_ctx)
{
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_holder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_holder.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_holder.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_holder.c Thu Dec 15 20:06:29 2005
@@ -72,7 +72,7 @@
if(NULL == phase_holder_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -84,7 +84,7 @@
if(NULL == phase_holder_impl->phase_holder.ops)
{
axis2_phase_holder_free(&(phase_holder_impl->phase_holder), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -206,7 +206,8 @@
phase_name = AXIS2_PHASE_RULE_GET_NAME(
AXIS2_HANDLER_DESC_GET_RULES(handler, env), env);
- if (axis2_phase_holder_is_phase_exist(phase_holder, env, phase_name))
+ if (AXIS2_TRUE == axis2_phase_holder_is_phase_exist(phase_holder, env,
+ phase_name))
{
status = AXIS2_PHASE_ADD_HANDLER_DESC(axis2_phase_holder_get_phase(phase_holder,
env, phase_name), env, handler);
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_resolver.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_resolver.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/src/phase_resolver.c Thu Dec 15 20:06:29 2005
@@ -140,7 +140,7 @@
if(NULL == phase_resolver_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -156,7 +156,7 @@
if(NULL == phase_resolver_impl->phase_resolver.ops)
{
axis2_phase_resolver_free(&(phase_resolver_impl->phase_resolver), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -341,7 +341,6 @@
size = AXIS2_ARRAY_LIST_SIZE(moduleqnames, env);
if(AXIS2_TRUE != AXIS2_ERROR_GET_STATUS_CODE((*env)->error))
{
- printf("came30\n");
return AXIS2_FAILURE;
}
@@ -406,7 +405,7 @@
return AXIS2_FAILURE;
}
- all_handlers = axis2_array_list_create(env, 0);
+
if(!all_handlers)
{
return AXIS2_FAILURE;
@@ -423,11 +422,6 @@
phase_name = AXIS2_PHASE_RULE_GET_NAME(phase_rule, env);
if(NULL != phase_name)
{
- if(all_handlers)
- {
- AXIS2_ARRAY_LIST_FREE(all_handlers, env);
- all_handlers = NULL;
- }
return AXIS2_FAILURE;
}
if ((0 != AXIS2_STRCMP(AXIS2_PHASE_TRANSPORTIN, phase_name)) &&
@@ -435,6 +429,12 @@
(0 != AXIS2_STRCMP(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
(0 != AXIS2_STRCMP(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
{
+ if(!all_handlers)
+ {
+ all_handlers = axis2_array_list_create(env, 0);
+ if(!all_handlers)
+ return AXIS2_FAILURE;
+ }
status = AXIS2_ARRAY_LIST_ADD(all_handlers, env, metadata);
if(AXIS2_FAILURE == status)
{
@@ -457,7 +457,7 @@
}
}
- printf("came31\n");
+
/**************************************************************************/
/************************** SERVICE HANDLERS ******************************/
/**************************************************************************/
@@ -467,7 +467,6 @@
case AXIS2_INFLOW:
{
- printf("came32\n");
flow = AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(resolver_impl->
svc->wsdl_svc->wsdl_component, env, INFLOW_KEY);
break;
@@ -491,12 +490,13 @@
break;
}
}
- printf("came33\n");
+
if (NULL != flow)
{
int j = 0;
int count = 0;
count = AXIS2_FLOW_GET_HANDLER_COUNT(flow, env);
+
if(AXIS2_FAILURE == AXIS2_ERROR_GET_STATUS_CODE((*env)->error))
{
if(all_handlers)
@@ -514,15 +514,18 @@
metadata = AXIS2_FLOW_GET_HANDLER(flow, env, j);
phase_name = AXIS2_PHASE_RULE_GET_NAME(AXIS2_HANDLER_DESC_GET_RULES(metadata,
env), env);
+
/* TODO change this in properway */
if(0 == AXIS2_STRCMP(phase_name, ""))
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_PHASE_IS_NOT_SPECIFED, AXIS2_FAILURE);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_PHASE_IS_NOT_SPECIFED,
+ AXIS2_FAILURE);
+ return AXIS2_FAILURE;
- } else if ((0 != AXIS2_STRCMP(AXIS2_PHASE_TRANSPORTIN, phase_name)) &&
- (0 != AXIS2_STRCMP(AXIS2_PHASE_DISPATCH, phase_name)) &&
- (0 != AXIS2_STRCMP(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
- (0 != AXIS2_STRCMP(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+ } else if ((0 == AXIS2_STRCMP(AXIS2_PHASE_TRANSPORTIN, phase_name)) ||
+ (0 == AXIS2_STRCMP(AXIS2_PHASE_DISPATCH, phase_name)) ||
+ (0 == AXIS2_STRCMP(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
+ (0 == AXIS2_STRCMP(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
{
if(all_handlers)
{
@@ -535,7 +538,15 @@
} else
{
+ if(!all_handlers)
+ {
+ all_handlers = axis2_array_list_create(env, 0);
+ if(!all_handlers)
+ return AXIS2_FAILURE;
+ }
+
status = AXIS2_ARRAY_LIST_ADD(all_handlers, env, metadata);
+
if(AXIS2_FAILURE == status)
{
if(all_handlers)
@@ -548,14 +559,14 @@
}
}
}
- printf("came34\n");
+
if(resolver_impl->phase_holder)
{
AXIS2_PHASE_HOLDER_FREE(resolver_impl->phase_holder, env);
}
+
switch (type)
{
- printf("came35\n");
case AXIS2_INFLOW:
{
resolver_impl->phase_holder = axis2_phase_holder_create_with_phases(env,
@@ -583,7 +594,6 @@
}
if(!all_handlers)
{
- printf("came36\n");
return AXIS2_FAILURE;
}
@@ -600,9 +610,8 @@
metadata = (struct axis2_handler_desc *)
AXIS2_ARRAY_LIST_GET(all_handlers, env, i);
status = AXIS2_PHASE_HOLDER_ADD_HANDLER(resolver_impl->phase_holder, env, metadata);
-
}
- printf("came37\n");
+
/* Free the locally created all_handlers list */
if(all_handlers)
AXIS2_ARRAY_LIST_FREE(all_handlers, env);
@@ -1301,7 +1310,7 @@
{
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_SERVICE_MODULE_CAN_NOT_REFER_GLOBAL_PHASE, AXIS2_FAILURE);
- return NULL;
+ return AXIS2_FAILURE;
}
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_header.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_header.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_header.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_header.c Thu Dec 15 20:06:29 2005
@@ -65,7 +65,8 @@
if(NULL == http_header_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
http_header_impl->name = (axis2_char_t *)AXIS2_STRDUP(name, env);
http_header_impl->value = (axis2_char_t *)AXIS2_STRDUP(value, env);
@@ -76,7 +77,8 @@
{
axis2_http_header_free((axis2_http_header_t*)
http_header_impl, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
http_header_impl->http_header.ops->to_external_form =
Modified: webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_request_line.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_request_line.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_request_line.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_request_line.c Thu Dec 15 20:06:29 2005
@@ -83,7 +83,8 @@
if(NULL == request_line_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
request_line_impl->method = (axis2_char_t *)AXIS2_STRDUP(method, env);
request_line_impl->uri = (axis2_char_t *)AXIS2_STRDUP(uri, env);
@@ -96,7 +97,8 @@
{
axis2_http_request_line_free((axis2_http_request_line_t*)
request_line_impl, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
request_line_impl->request_line.ops->get_method =
@@ -158,13 +160,15 @@
{
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_INVALID_HTTP_INVALID_HEADER_START_LINE,
- NULL);
+ AXIS2_FAILURE);
+ return NULL;
}
i = tmp - str;
req_line = AXIS2_MALLOC((*env)->allocator, i * sizeof(axis2_char_t) +1);
if(NULL == req_line)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
memcpy(req_line, str, i * sizeof(axis2_char_t));
req_line[i] = '\0';
@@ -177,7 +181,8 @@
AXIS2_FREE((*env)->allocator, req_line);
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_INVALID_HTTP_INVALID_HEADER_START_LINE,
- NULL);
+ AXIS2_FAILURE);
+ return NULL;
}
*tmp++ = '\0';
uri = tmp;
@@ -187,7 +192,8 @@
AXIS2_FREE((*env)->allocator, req_line);
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_INVALID_HTTP_INVALID_HEADER_START_LINE,
- NULL);
+ AXIS2_FAILURE);
+ return NULL;
}
*tmp++ = '\0';
http_version = tmp;
@@ -243,7 +249,8 @@
alloc_len * sizeof(axis2_char_t));
if(NULL == ret)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
sprintf(ret, "%s %s %s %s", req_line_impl->method, req_line_impl->uri,
req_line_impl->http_version, AXIS2_HTTP_CRLF);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_response_writer.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_response_writer.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_response_writer.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_response_writer.c Thu Dec 15 20:06:29 2005
@@ -110,7 +110,8 @@
if(NULL == response_writer_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
response_writer_impl->stream = stream;
response_writer_impl->encoding = (axis2_char_t *)AXIS2_STRDUP(encoding, env);
@@ -121,7 +122,8 @@
{
axis2_http_response_writer_free((axis2_http_response_writer_t*)
response_writer_impl, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
response_writer_impl->response_writer.ops->get_encoding =
Modified: webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_simple_request.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_simple_request.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_simple_request.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_simple_request.c Thu Dec 15 20:06:29 2005
@@ -123,7 +123,8 @@
if(NULL == simple_request_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
simple_request_impl->request_line = request_line;
simple_request_impl->stream = content;
@@ -148,7 +149,8 @@
{
axis2_http_simple_request_free((axis2_http_simple_request_t*)
simple_request_impl, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
simple_request_impl->simple_request.ops->get_request_line =
Modified: webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_simple_response.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_simple_response.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_simple_response.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_simple_response.c Thu Dec 15 20:06:29 2005
@@ -151,7 +151,8 @@
AXIS2_INTF_TO_IMPL(ret);
if(NULL == simple_response_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
simple_response_impl->status_line = status_line;
if(http_hdr_count > 0 && NULL != http_headers)
@@ -187,7 +188,8 @@
{
axis2_http_simple_response_free((axis2_http_simple_response_t*)
simple_response_impl, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
simple_response_impl->simple_response.ops->set_status_line =
axis2_http_simple_response_set_status_line;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_status_line.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_status_line.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_status_line.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_status_line.c Thu Dec 15 20:06:29 2005
@@ -82,7 +82,8 @@
if(NULL == status_line_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
status_line_impl->line = (axis2_char_t *)AXIS2_STRDUP(str, env);
status_line_impl->http_version = NULL;
@@ -96,7 +97,8 @@
status_line_impl, env);
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_INVALID_HTTP_INVALID_HEADER_START_LINE,
- NULL);
+ AXIS2_FAILURE);
+ return NULL;
}
i = tmp - str;
tmp_status_line = AXIS2_MALLOC((*env)->allocator,
@@ -105,7 +107,8 @@
{
axis2_http_status_line_free((axis2_http_status_line_t*)
status_line_impl, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
memcpy(tmp_status_line, str, i * sizeof(axis2_char_t));
tmp_status_line[i] = '\0';
@@ -120,7 +123,8 @@
status_line_impl, env);
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_INVALID_HTTP_INVALID_HEADER_START_LINE,
- NULL);
+ AXIS2_FAILURE);
+ return NULL;
}
*tmp++ = '\0';
status_code = tmp;
@@ -132,7 +136,8 @@
status_line_impl, env);
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_INVALID_HTTP_INVALID_HEADER_START_LINE,
- NULL);
+ AXIS2_FAILURE);
+ return NULL;
}
*tmp++ = '\0';
reason_phrase = tmp;
@@ -149,7 +154,8 @@
AXIS2_FREE((*env)->allocator, tmp_status_line);
axis2_http_status_line_free((axis2_http_status_line_t*)
status_line_impl, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
AXIS2_FREE((*env)->allocator, tmp_status_line);
@@ -159,7 +165,8 @@
{
axis2_http_status_line_free((axis2_http_status_line_t*)
status_line_impl, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
status_line_impl->status_line.ops->get_status_code =
Modified: webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_worker.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_worker.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_http_worker.c Thu Dec 15 20:06:29 2005
@@ -70,7 +70,8 @@
if(NULL == http_worker_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
http_worker_impl->conf_ctx = conf_ctx;
@@ -79,7 +80,8 @@
if(NULL == http_worker_impl->http_worker.ops)
{
axis2_http_worker_free((axis2_http_worker_t*)http_worker_impl, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
http_worker_impl->http_worker.ops->process_request =
Modified: webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_simple_http_svr_conn.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_simple_http_svr_conn.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_simple_http_svr_conn.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/src/axis2_simple_http_svr_conn.c Thu Dec 15 20:06:29 2005
@@ -89,7 +89,8 @@
if(NULL == svr_conn_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
svr_conn_impl->socket = sockfd;
svr_conn_impl->stream = NULL;
@@ -101,7 +102,8 @@
{
axis2_simple_http_svr_conn_free((axis2_simple_http_svr_conn_t *)
svr_conn_impl, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
svr_conn_impl->svr_conn.ops->close = axis2_simple_http_svr_conn_close;
svr_conn_impl->svr_conn.ops->is_open = axis2_simple_http_svr_conn_is_open;
Modified: webservices/axis2/trunk/c/modules/util/src/array_list.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/array_list.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/array_list.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/array_list.c Thu Dec 15 20:06:29 2005
@@ -99,8 +99,9 @@
array_list_impl->data = AXIS2_MALLOC((*env)->allocator, sizeof(void*) * capacity );
if (!array_list_impl->data)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
axis2_array_list_free(&(array_list_impl->array_list), env);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
array_list_impl->capacity = capacity;
Modified: webservices/axis2/trunk/c/modules/util/src/linked_list.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/linked_list.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/linked_list.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/linked_list.c Thu Dec 15 20:06:29 2005
@@ -200,7 +200,7 @@
linked_list_impl = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_linked_list_impl_t) );
if (!linked_list_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -210,7 +210,7 @@
sizeof(axis2_linked_list_ops_t) );
if (!linked_list_impl->linked_list.ops)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
axis2_linked_list_free(&(linked_list_impl->linked_list), env);
return NULL;
}
@@ -257,7 +257,10 @@
{
entry_t *entry = (entry_t *) AXIS2_MALLOC((*env)->allocator, sizeof(entry_t));
if(NULL == entry)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
entry->data = data;
entry->previous = NULL;
@@ -438,7 +441,7 @@
if (index < 0 || index > AXIS2_INTF_TO_IMPL(linked_list)->size)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INDEX_OUT_OF_BOUNDS, AXIS2_FALSE);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INDEX_OUT_OF_BOUNDS, AXIS2_FAILURE);
return AXIS2_FALSE;
}
return AXIS2_TRUE;
@@ -458,7 +461,7 @@
AXIS2_FUNC_PARAM_CHECK(linked_list, env, AXIS2_FALSE);
if (index < 0 || index >= AXIS2_INTF_TO_IMPL(linked_list)->size)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INDEX_OUT_OF_BOUNDS, AXIS2_FALSE);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INDEX_OUT_OF_BOUNDS, AXIS2_FAILURE);
return AXIS2_FALSE;
}
return AXIS2_TRUE;
@@ -476,7 +479,10 @@
{
AXIS2_FUNC_PARAM_CHECK(linked_list, env, NULL);
if (AXIS2_INTF_TO_IMPL(linked_list)->size == 0)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_SUCH_ELEMENT, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_SUCH_ELEMENT, AXIS2_FAILURE);
+ return NULL;
+ }
return AXIS2_INTF_TO_IMPL(linked_list)->first->data;
}
@@ -493,7 +499,10 @@
AXIS2_FUNC_PARAM_CHECK(linked_list, env, NULL);
if (AXIS2_INTF_TO_IMPL(linked_list)->size == 0)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_SUCH_ELEMENT, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_SUCH_ELEMENT, AXIS2_FAILURE);
+ return NULL;
+ }
return AXIS2_INTF_TO_IMPL(linked_list)->last->data;
}
@@ -511,7 +520,10 @@
AXIS2_FUNC_PARAM_CHECK(linked_list, env, NULL);
if (AXIS2_INTF_TO_IMPL(linked_list)->size == 0)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_SUCH_ELEMENT, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_SUCH_ELEMENT, AXIS2_FAILURE);
+ return NULL;
+ }
AXIS2_INTF_TO_IMPL(linked_list)->mod_count++;
AXIS2_INTF_TO_IMPL(linked_list)->size--;
@@ -541,7 +553,10 @@
AXIS2_FUNC_PARAM_CHECK(linked_list, env, NULL);
if (AXIS2_INTF_TO_IMPL(linked_list)->size == 0)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_SUCH_ELEMENT, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_SUCH_ELEMENT, AXIS2_FAILURE);
+ return NULL;
+ }
AXIS2_INTF_TO_IMPL(linked_list)->mod_count++;
AXIS2_INTF_TO_IMPL(linked_list)->size--;
Modified: webservices/axis2/trunk/c/modules/util/src/qname.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/qname.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/qname.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/qname.c Thu Dec 15 20:06:29 2005
@@ -354,7 +354,10 @@
AXIS2_INTF_TO_IMPL(qname)->prefix = (axis2_char_t*)AXIS2_STRDUP(prefix, env);
if(!AXIS2_INTF_TO_IMPL(qname)->prefix)
+ {
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return AXIS2_FAILURE;
+ }
return AXIS2_SUCCESS;
}
@@ -374,6 +377,9 @@
AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(qname)->localpart);
AXIS2_INTF_TO_IMPL(qname)->localpart = (axis2_char_t*)AXIS2_STRDUP(localpart, env);
if(!AXIS2_INTF_TO_IMPL(qname)->localpart)
+ {
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return AXIS2_FAILURE;
+ }
return AXIS2_SUCCESS;
}