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 ka...@apache.org on 2008/03/24 11:03:42 UTC
svn commit: r640363 - in /webservices/axis2/trunk/c/axiom/src/soap:
soap_fault_detail.c soap_fault_node.c soap_fault_reason.c soap_fault_role.c
soap_fault_sub_code.c soap_fault_text.c soap_fault_value.c soap_header.c
soap_header_block.c
Author: kaushalye
Date: Mon Mar 24 03:03:41 2008
New Revision: 640363
URL: http://svn.apache.org/viewvc?rev=640363&view=rev
Log:
Axis2C hackathon: Error handling in SOAP
Modified:
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_detail.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_node.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_sub_code.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c
webservices/axis2/trunk/c/axiom/src/soap/soap_header.c
webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_detail.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_detail.c?rev=640363&r1=640362&r2=640363&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_detail.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_detail.c Mon Mar 24 03:03:41 2008
@@ -39,6 +39,8 @@
if (!fault_detail)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "No memory. Cannot create a fault detail");
return NULL;
}
@@ -112,8 +114,9 @@
if (axiom_node_get_node_type(node, env) != AXIOM_ELEMENT)
{
- AXIS2_ERROR_SET(env->error,
+ AXIS2_HANDLE_ERROR(env,
AXIS2_ERROR_OM_ELEMENT_EXPECTED, AXIS2_FAILURE);
+
return AXIS2_FAILURE;
}
@@ -146,7 +149,7 @@
if (axiom_node_get_node_type(node, env) != AXIOM_ELEMENT)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_BASE_TYPE,
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_INVALID_BASE_TYPE,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_node.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_node.c?rev=640363&r1=640362&r2=640363&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_node.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_node.c Mon Mar 24 03:03:41 2008
@@ -39,6 +39,8 @@
if (!fault_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "No memory. Cannot create a SOAP fault node");
return NULL;
}
fault_node->om_ele_node = NULL;
@@ -166,7 +168,7 @@
AXIS2_PARAM_CHECK(env->error, node, AXIS2_FAILURE);
if (axiom_node_get_node_type(node, env) != AXIOM_ELEMENT)
{
- AXIS2_ERROR_SET(env->error,
+ AXIS2_HANDLE_ERROR(env,
AXIS2_ERROR_INVALID_BASE_TYPE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c?rev=640363&r1=640362&r2=640363&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c Mon Mar 24 03:03:41 2008
@@ -51,6 +51,8 @@
if (!fault_reason)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "No memory. Cannot create SOAP fault reason");
return NULL;
}
@@ -209,7 +211,7 @@
if (axiom_node_get_node_type(node, env) != AXIOM_ELEMENT)
{
- AXIS2_ERROR_SET(env->error,
+ AXIS2_HANDLE_ERROR(env,
AXIS2_ERROR_INVALID_BASE_TYPE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c?rev=640363&r1=640362&r2=640363&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c Mon Mar 24 03:03:41 2008
@@ -39,6 +39,8 @@
if (!fault_role)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "No memory. Cannot create SOAP fault role");
return NULL;
}
@@ -166,7 +168,7 @@
if (axiom_node_get_node_type(node, env) != AXIOM_ELEMENT)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_BASE_TYPE,
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_INVALID_BASE_TYPE,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_sub_code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_sub_code.c?rev=640363&r1=640362&r2=640363&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_sub_code.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_sub_code.c Mon Mar 24 03:03:41 2008
@@ -48,6 +48,8 @@
if (!fault_sub_code)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "No memory. Cannot create SOAP fault sub-code");
return NULL;
}
@@ -258,7 +260,7 @@
if (axiom_node_get_node_type(node, env) != AXIOM_ELEMENT)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_BASE_TYPE,
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_INVALID_BASE_TYPE,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c?rev=640363&r1=640362&r2=640363&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c Mon Mar 24 03:03:41 2008
@@ -46,6 +46,8 @@
if (!fault_text)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "No memory. Cannot create SOAP fault text");
return NULL;
}
@@ -244,7 +246,7 @@
if (node && (axiom_node_get_node_type(node, env) != AXIOM_ELEMENT))
{
- AXIS2_ERROR_SET(env->error,
+ AXIS2_HANDLE_ERROR(env,
AXIS2_ERROR_INVALID_BASE_TYPE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c?rev=640363&r1=640362&r2=640363&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c Mon Mar 24 03:03:41 2008
@@ -41,6 +41,8 @@
if (!fault_value)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "No memory. Cannot create SOAP fault value");
return NULL;
}
@@ -187,7 +189,7 @@
if (node && (axiom_node_get_node_type(node, env) != AXIOM_ELEMENT))
{
- AXIS2_ERROR_SET(env->error,
+ AXIS2_HANDLE_ERROR(env,
AXIS2_ERROR_INVALID_BASE_TYPE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_header.c?rev=640363&r1=640362&r2=640363&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_header.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_header.c Mon Mar 24 03:03:41 2008
@@ -58,6 +58,8 @@
if (!soap_header)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "No memory. Cannot create SOAP header");
return NULL;
}
@@ -339,7 +341,7 @@
if (axiom_node_get_node_type(node, env) != AXIOM_ELEMENT)
{
- AXIS2_ERROR_SET(env->error,
+ AXIS2_HANDLE_ERROR(env,
AXIS2_ERROR_INVALID_BASE_TYPE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c?rev=640363&r1=640362&r2=640363&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c Mon Mar 24 03:03:41 2008
@@ -45,6 +45,8 @@
if (!header_block)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "No memory. Cannot create SOAP header block");
return NULL;
}
@@ -225,7 +227,7 @@
}
else
{
- AXIS2_ERROR_SET(env->error,
+ AXIS2_HANDLE_ERROR(env,
AXIS2_ERROR_MUST_UNDERSTAND_SHOULD_BE_1_0_TRUE_FALSE,
AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -270,7 +272,7 @@
{
return AXIS2_FALSE;
}
- AXIS2_ERROR_SET(env->error,
+ AXIS2_HANDLE_ERROR(env,
AXIS2_ERROR_INVALID_VALUE_FOUND_IN_MUST_UNDERSTAND,
AXIS2_FAILURE);
return AXIS2_FALSE;
@@ -424,7 +426,7 @@
if (axiom_node_get_node_type(node, env) != AXIOM_ELEMENT)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_BASE_TYPE,
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_INVALID_BASE_TYPE,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org