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 ka...@apache.org on 2008/03/24 10:52:08 UTC
svn commit: r640358 - in /webservices/axis2/trunk/c/axiom/src/soap:
soap_envelope.c soap_fault.c soap_fault_code.c
Author: kaushalye
Date: Mon Mar 24 02:52:08 2008
New Revision: 640358
URL: http://svn.apache.org/viewvc?rev=640358&view=rev
Log:
Axis2C hackathon : AXIOM Error handling
Modified:
webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_code.c
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c?rev=640358&r1=640357&r2=640358&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c Mon Mar 24 02:52:08 2008
@@ -62,6 +62,8 @@
if (!soap_envelope)
{
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 Envelope");
return NULL;
}
soap_envelope->om_ele_node = NULL;
@@ -102,6 +104,8 @@
if (!ele)
{
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 element");
axiom_soap_envelope_free(soap_envelope, env);
return NULL;
}
@@ -130,6 +134,8 @@
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_SOAP_VERSION,
AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Invalid SOAP version");
return NULL;
}
if (!prefix || axutil_strcmp(prefix, "") == 0)
@@ -199,8 +205,7 @@
if (axiom_node_get_node_type(node, env) != AXIOM_ELEMENT)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_BASE_TYPE,
- AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_INVALID_BASE_TYPE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
soap_envelope->om_ele_node = node;
@@ -447,8 +452,7 @@
return soap_envelope;
}
- AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_INVALID_SOAP_VERSION, AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_INVALID_SOAP_VERSION, AXIS2_FAILURE);
return NULL;
}
@@ -467,8 +471,7 @@
if (AXIOM_SOAP11 != soap_version && AXIOM_SOAP12 != soap_version)
{
- AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_INVALID_SOAP_VERSION, AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_INVALID_SOAP_VERSION, AXIS2_FAILURE);
return NULL;
}
@@ -557,8 +560,7 @@
}
else
{
- AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_INVALID_SOAP_NAMESPACE_URI, AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_INVALID_SOAP_NAMESPACE_URI, AXIS2_FAILURE);
}
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c?rev=640358&r1=640357&r2=640358&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c Mon Mar 24 02:52:08 2008
@@ -63,6 +63,8 @@
if (!soap_fault)
{
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");
return NULL;
}
soap_fault->exception = NULL;
@@ -419,7 +421,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_code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_code.c?rev=640358&r1=640357&r2=640358&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_code.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_code.c Mon Mar 24 02:52:08 2008
@@ -48,6 +48,8 @@
if (!fault_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 code");
return NULL;
}
@@ -269,7 +271,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