Author: sahan
Date: Tue Jul 11 03:40:09 2006
New Revision: 420792
URL: http://svn.apache.org/viewvc?rev=420792&view=rev
Log:
Fixing a bug in syschronization in conf ctx.
Removing some javadocs
Fixing a function in core/addr
Modified:
webservices/axis2/trunk/c/include/axis2_transport_sender.h
webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c
webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
Modified: webservices/axis2/trunk/c/include/axis2_transport_sender.h
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_transport_sender.h?rev=420792&r1=420791&r2=420792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_transport_sender.h (original)
+++ webservices/axis2/trunk/c/include/axis2_transport_sender.h Tue Jul 11
03:40:09 2006
@@ -64,7 +64,6 @@
* Initialize
* @param confContext
* @param transportOut
- * @throws org.apache.axis2.AxisFault
*/
axis2_status_t (AXIS2_CALL *
init) (axis2_transport_sender_t *transport_sender,
@@ -74,7 +73,6 @@
/**
* Clean up
* @param msgContext
- * @throws org.apache.axis2.AxisFault
*/
axis2_status_t (AXIS2_CALL *
cleanup) (axis2_transport_sender_t *transport_sender,
@@ -84,7 +82,6 @@
/**
* Invoke
* @param msgContext
- * @throws org.apache.axis2.AxisFault
*/
axis2_status_t (AXIS2_CALL *
invoke) (axis2_transport_sender_t *transport_sender,
Modified: webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c?rev=420792&r1=420791&r2=420792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c Tue Jul 11
03:40:09 2006
@@ -460,12 +460,16 @@
AXIS2_FREE(env->allocator,
AXIS2_INTF_TO_IMPL(msg_info_headers)->action);
AXIS2_INTF_TO_IMPL(msg_info_headers)->action = NULL;
}
- AXIS2_INTF_TO_IMPL(msg_info_headers)->action = AXIS2_STRDUP(action, env);
- if(NULL == AXIS2_INTF_TO_IMPL(msg_info_headers)->action)
+ if(NULL != action)
+ AXIS2_INTF_TO_IMPL(msg_info_headers)->action = AXIS2_STRDUP(action,
env);
+ /* We should be able to reset action by passing NULL
+ * so don't throw failure if action is NULL
+ */
+ /*if(NULL == AXIS2_INTF_TO_IMPL(msg_info_headers)->action)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
- }
+ }*/
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/conf_ctx.c?rev=420792&r1=420791&r2=420792&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/conf_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/conf_ctx.c Tue Jul 11
03:40:09 2006
@@ -341,7 +341,8 @@
axis2_char_t *message_id)
{
axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
-
+ axis2_op_ctx_t *rv = NULL;
+
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, message_id, NULL);
@@ -349,15 +350,13 @@
axis2_thread_mutex_lock(conf_ctx_impl->mutex);
if (conf_ctx_impl->op_ctx_map)
{
- axis2_op_ctx_t *rv = NULL;
rv = (axis2_op_ctx_t*)axis2_hash_get(conf_ctx_impl->op_ctx_map,
message_id, AXIS2_HASH_KEY_STRING);
axis2_thread_mutex_unlock(conf_ctx_impl->mutex);
- return rv;
}
- axis2_thread_mutex_unlock(conf_ctx_impl->mutex);
- return NULL;
+ axis2_thread_mutex_unlock(conf_ctx_impl->mutex);
+ return rv;
}
axis2_status_t AXIS2_CALL
@@ -387,6 +386,7 @@
axis2_char_t *svc_id)
{
axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
+ axis2_svc_ctx_t *rv = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -394,14 +394,12 @@
axis2_thread_mutex_lock(conf_ctx_impl->mutex);
if (conf_ctx_impl->svc_ctx_map)
{
- axis2_svc_ctx_t *rv = NULL;
rv = (axis2_svc_ctx_t*)axis2_hash_get(conf_ctx_impl->svc_ctx_map,
svc_id, AXIS2_HASH_KEY_STRING);
- axis2_thread_mutex_unlock(conf_ctx_impl->mutex);
- return rv;
+ axis2_thread_mutex_unlock(conf_ctx_impl->mutex);
}
- axis2_thread_mutex_unlock(conf_ctx_impl->mutex);
- return NULL;
+ axis2_thread_mutex_unlock(conf_ctx_impl->mutex);
+ return rv;
}
axis2_status_t AXIS2_CALL
@@ -431,6 +429,7 @@
axis2_char_t *svc_grp_id)
{
axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
+ axis2_svc_grp_ctx_t *rv = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -438,28 +437,26 @@
axis2_thread_mutex_lock(conf_ctx_impl->mutex);
if (conf_ctx_impl->svc_grp_ctx_map)
{
- axis2_svc_grp_ctx_t *rv = NULL;
rv =
(axis2_svc_grp_ctx_t*)axis2_hash_get(conf_ctx_impl->svc_grp_ctx_map
, svc_grp_id, AXIS2_HASH_KEY_STRING);
- axis2_thread_mutex_unlock(conf_ctx_impl->mutex);
- return rv;
+ axis2_thread_mutex_unlock(conf_ctx_impl->mutex);
}
axis2_thread_mutex_unlock(conf_ctx_impl->mutex);
- return NULL;
+ return rv;
}
axis2_char_t* AXIS2_CALL
axis2_conf_ctx_get_root_dir(struct axis2_conf_ctx *conf_ctx,
const axis2_env_t *env)
{
- axis2_char_t *rv = NULL;
- axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
+ axis2_char_t *rv = NULL;
+ axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- conf_ctx_impl = AXIS2_INTF_TO_IMPL(conf_ctx);
- axis2_thread_mutex_lock(conf_ctx_impl->mutex);
+ conf_ctx_impl = AXIS2_INTF_TO_IMPL(conf_ctx);
+ axis2_thread_mutex_lock(conf_ctx_impl->mutex);
rv = AXIS2_INTF_TO_IMPL(conf_ctx)->root_dir;
- axis2_thread_mutex_unlock(conf_ctx_impl->mutex);
- return rv;
+ axis2_thread_mutex_unlock(conf_ctx_impl->mutex);
+ return rv;
}
axis2_status_t AXIS2_CALL
@@ -485,7 +482,7 @@
if (!(conf_ctx_impl->root_dir))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- axis2_thread_mutex_unlock(conf_ctx_impl->mutex);
+ axis2_thread_mutex_unlock(conf_ctx_impl->mutex);
return AXIS2_FAILURE;
}
}
@@ -505,7 +502,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
conf_ctx_impl = AXIS2_INTF_TO_IMPL(conf_ctx);
- axis2_thread_mutex_lock(conf_ctx_impl->mutex);
+ axis2_thread_mutex_lock(conf_ctx_impl->mutex);
conf_ctx_impl->conf = conf;
for (hi = axis2_hash_first (conf_ctx_impl->op_ctx_map, env);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
