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/03/03 08:00:10 UTC
svn commit: r382696 - in /webservices/axis2/trunk/c/modules/core/deployment:
arch_reader.c dep_engine.c svc_builder.c
Author: damitha
Date: Thu Mar 2 23:00:08 2006
New Revision: 382696
URL: http://svn.apache.org/viewcvs?rev=382696&view=rev
Log:
Some minor fixes
Modified:
webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?rev=382696&r1=382695&r2=382696&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Thu Mar 2 23:00:08 2006
@@ -347,9 +347,9 @@
status = axis2_arch_reader_build_svc_grp(arch_reader, env, svcs_xml,
dep_engine, svc_grp);
- if(AXIS2_FAILURE == status)
+ if(AXIS2_SUCCESS != status)
{
- return AXIS2_FAILURE;
+ return status;
}
arch_file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(dep_engine, env);
svc_name = AXIS2_ARCH_FILE_DATA_GET_SVC_NAME(arch_file_data, env);
@@ -419,8 +419,8 @@
AXIS2_QNAME_FREE(svc_qname, env);
if(AXIS2_SUCCESS != status)
{
- svc_qname = NULL;
- return AXIS2_FAILURE;
+ AXIS2_SVC_FREE(svc, env);
+ return status;
}
}
AXIS2_SVC_SET_PARENT(svc, env, svc_grp);
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=382696&r1=382695&r2=382696&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Thu Mar 2 23:00:08 2006
@@ -1508,17 +1508,19 @@
file_name, dep_engine, svc_grp);
if(AXIS2_SUCCESS != status)
{
+ AXIS2_ARCH_READER_FREE(arch_reader, env);
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_SVC,
AXIS2_FAILURE);
- return AXIS2_FAILURE;
+ return status;
}
status = axis2_dep_engine_add_new_svc(dep_engine, env,
svc_grp);
if(AXIS2_SUCCESS != status)
{
+ AXIS2_ARCH_READER_FREE(arch_reader, env);
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_SVC,
AXIS2_FAILURE);
- return AXIS2_FAILURE;
+ return status;
}
/* log.info(Messages.getMessage(
DeploymentErrorMsgs.DEPLOYING_WS, currentArchiveFile.getName())); */
@@ -1535,6 +1537,7 @@
meta_data);
if(AXIS2_SUCCESS != status)
{
+ AXIS2_ARCH_READER_FREE(arch_reader, env);
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_MODULE,
AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -1543,6 +1546,7 @@
meta_data);
if(AXIS2_SUCCESS != status)
{
+ AXIS2_ARCH_READER_FREE(arch_reader, env);
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_MODULE,
AXIS2_FAILURE);
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?rev=382696&r1=382695&r2=382696&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Thu Mar 2 23:00:08 2006
@@ -377,6 +377,7 @@
impl_info_param->ops->value_free = axis2_dll_desc_free_void_arg;
if(AXIS2_SUCCESS != status)
{
+ AXIS2_DLL_DESC_FREE(dll_desc, env);
return status;
}
/* end of my logic */