Author: damitha
Date: Tue Nov 11 07:29:33 2008
New Revision: 713060
URL: http://svn.apache.org/viewvc?rev=713060&view=rev
Log:
Fixing ERROR_SET related issues
Modified:
webservices/savan/trunk/c/src/client/savan_client.c
webservices/savan/trunk/c/src/client/savan_publishing_client.c
webservices/savan/trunk/c/src/core/mod_savan.c
webservices/savan/trunk/c/src/core/savan_sub_processor.c
webservices/savan/trunk/c/src/util/db_mgr.c
Modified: webservices/savan/trunk/c/src/client/savan_client.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/client/savan_client.c?rev=713060&r1=713059&r2=713060&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/client/savan_client.c (original)
+++ webservices/savan/trunk/c/src/client/savan_client.c Tue Nov 11 07:29:33 2008
@@ -64,6 +64,8 @@
if (!client)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[savan] Memory allocation failed for Savan Client");
return NULL;
}
Modified: webservices/savan/trunk/c/src/client/savan_publishing_client.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/client/savan_publishing_client.c?rev=713060&r1=713059&r2=713060&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/client/savan_publishing_client.c (original)
+++ webservices/savan/trunk/c/src/client/savan_publishing_client.c Tue Nov 11
07:29:33 2008
@@ -50,6 +50,8 @@
if (!client)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[savan] Memory allocation failed for Savan Publishing Client");
return NULL;
}
Modified: webservices/savan/trunk/c/src/core/mod_savan.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/core/mod_savan.c?rev=713060&r1=713059&r2=713060&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/core/mod_savan.c (original)
+++ webservices/savan/trunk/c/src/core/mod_savan.c Tue Nov 11 07:29:33 2008
@@ -108,6 +108,8 @@
if(!module->handler_create_func_map)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[savan] Memory allocation failed for Savan Module");
return AXIS2_FAILURE;
}
/* Remove the hard coded strings. Instead use macros */
Modified: webservices/savan/trunk/c/src/core/savan_sub_processor.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/core/savan_sub_processor.c?rev=713060&r1=713059&r2=713060&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/core/savan_sub_processor.c (original)
+++ webservices/savan/trunk/c/src/core/savan_sub_processor.c Tue Nov 11
07:29:33 2008
@@ -99,8 +99,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to create a
subscriber");
AXIS2_ERROR_SET(env->error, SAVAN_ERROR_FAILED_TO_CREATE_SUBSCRIBER,
AXIS2_FAILURE);
- status = axutil_error_get_status_code(env->error);
- return status;
+ return AXIS2_FAILURE;
}
/* Set the expiry time on the subscription */
/* TODO : For now we are ignoring the Expiry sent by the client. Add
support
@@ -196,12 +195,11 @@
{
axis2_char_t *reason = NULL;
- axutil_error_set_error_number(env->error,
SAVAN_ERROR_SUBSCRIBER_NOT_FOUND);
+ AXIS2_ERROR_SET(env->error, SAVAN_ERROR_SUBSCRIBER_NOT_FOUND,
AXIS2_FAILURE);
reason = (axis2_char_t *) axutil_error_get_message(env->error);
savan_util_create_fault_envelope(msg_ctx, env, SAVAN_FAULT_UTR_CODE,
SAVAN_FAULT_UTR_SUB_CODE, reason, SAVAN_FAULT_UTR_DETAIL1);
- AXIS2_ERROR_SET(env->error, SAVAN_ERROR_SUBSCRIBER_NOT_FOUND,
AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to find the
subscriber");
return AXIS2_FAILURE;
}
@@ -218,14 +216,13 @@
{
axis2_char_t *reason = NULL;
- axutil_error_set_error_number(env->error,
SAVAN_ERROR_UNABLE_TO_RENEW);
+ AXIS2_ERROR_SET(env->error, SAVAN_ERROR_UNABLE_TO_RENEW,
AXIS2_FAILURE);
reason = (axis2_char_t *) axutil_error_get_message(env->error);
savan_util_create_fault_envelope(msg_ctx, env, SAVAN_FAULT_UTR_CODE,
SAVAN_FAULT_UTR_SUB_CODE,
reason,
SAVAN_FAULT_UTR_DETAIL2);
- AXIS2_ERROR_SET(env->error, SAVAN_ERROR_UNABLE_TO_RENEW,
AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[savan] Subscription can not be renewed");
savan_subscriber_set_renew_status(subscriber, env, AXIS2_FALSE);
Modified: webservices/savan/trunk/c/src/util/db_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/util/db_mgr.c?rev=713060&r1=713059&r2=713060&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/util/db_mgr.c (original)
+++ webservices/savan/trunk/c/src/util/db_mgr.c Tue Nov 11 07:29:33 2008
@@ -926,6 +926,8 @@
if(!data_list)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[savan] Memory allocation failed for Savan DB Manager");
return NULL;
}
args = AXIS2_MALLOC(env->allocator, sizeof(savan_db_mgr_args_t));
