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 2007/11/22 08:56:38 UTC
svn commit: r597325 - in /webservices/axis2/trunk/c/src/core:
deployment/dep_engine.c description/svc.c
transport/http/util/http_transport_utils.c
Author: damitha
Date: Wed Nov 21 23:56:36 2007
New Revision: 597325
URL: http://svn.apache.org/viewvc?rev=597325&view=rev
Log:
Applied patches in AXIS2C-748, AXIS2C-751 and AXIS2C-752
Modified:
webservices/axis2/trunk/c/src/core/deployment/dep_engine.c
webservices/axis2/trunk/c/src/core/description/svc.c
webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c
Modified: webservices/axis2/trunk/c/src/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/dep_engine.c?rev=597325&r1=597324&r2=597325&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/src/core/deployment/dep_engine.c Wed Nov 21 23:56:36 2007
@@ -672,7 +672,6 @@
{
axis2_status_t status = AXIS2_FAILURE;
axutil_array_list_t *out_fault_phases = NULL;
- axutil_array_list_t *new_out_fault_phases = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -777,13 +776,10 @@
out_fault_phases =
axis2_phases_info_get_op_out_faultphases(dep_engine->phases_info, env);
- new_out_fault_phases = axis2_phases_info_copy_flow(env, out_fault_phases);
if (out_fault_phases)
{
- axutil_array_list_free(out_fault_phases, env);
+ axis2_conf_set_out_fault_phases(dep_engine->conf, env, out_fault_phases);
}
- axis2_conf_set_out_fault_phases(dep_engine->conf, env,
- new_out_fault_phases);
if (AXIS2_SUCCESS != status)
{
axis2_repos_listener_free(dep_engine->repos_listener, env);
@@ -794,7 +790,8 @@
status = axis2_dep_engine_engage_modules(dep_engine, env);
if (AXIS2_SUCCESS != status)
{
- AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI, "dep engine failed to engaged_modules");
+ AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
+ "[axis2] dep engine failed to engaged_modules");
axis2_repos_listener_free(dep_engine->repos_listener, env);
axis2_conf_free(dep_engine->conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_VALIDATION_FAILED,
Modified: webservices/axis2/trunk/c/src/core/description/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/description/svc.c?rev=597325&r1=597324&r2=597325&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/src/core/description/svc.c Wed Nov 21 23:56:36 2007
@@ -21,6 +21,7 @@
#include <axutil_property.h>
#include <axis2_module.h>
#include "../deployment/axis2_desc_builder.h"
+#include <axis2_svc_skeleton.h>
struct axis2_svc
{
@@ -275,8 +276,10 @@
axis2_svc_t * svc,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, void);
-
+ if (svc->impl_class)
+ {
+ AXIS2_SVC_SKELETON_FREE((axis2_svc_skeleton_t *) svc->impl_class, env);
+ }
if (svc->param_container)
{
axutil_param_container_free(svc->param_container, env);
Modified: webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c?rev=597325&r1=597324&r2=597325&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c Wed Nov 21 23:56:36 2007
@@ -543,7 +543,11 @@
{
axutil_string_free(char_set_str, env);
}
-
+ if (!soap_builder && om_builder)
+ {
+ axiom_stax_builder_free_self(om_builder, env);
+ om_builder = NULL;
+ }
return status;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org