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/20 08:54:48 UTC
svn commit: r639191 - in /webservices/axis2/trunk/c/axiom/src/soap:
soap11_builder_helper.c soap12_builder_helper.c
Author: kaushalye
Date: Thu Mar 20 00:54:47 2008
New Revision: 639191
URL: http://svn.apache.org/viewvc?rev=639191&view=rev
Log:
Axis2C hackathon : SOAP 1.1/1.2 builder helper - Code formatting and adding error logs
Modified:
webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c
webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c?rev=639191&r1=639190&r2=639191&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c Thu Mar 20 00:54:47 2008
@@ -56,17 +56,19 @@
axiom_stax_builder_t * om_builder)
{
axiom_soap11_builder_helper_t *builder_helper = NULL;
- AXIS2_ENV_CHECK(env, NULL);
+
AXIS2_PARAM_CHECK(env->error, soap_builder, NULL);
AXIS2_PARAM_CHECK(env->error, om_builder, NULL);
builder_helper =
(axiom_soap11_builder_helper_t *) AXIS2_MALLOC(env->allocator,
- sizeof
- (axiom_soap11_builder_helper_t));
+ sizeof(axiom_soap11_builder_helper_t));
+
if (!builder_helper)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "No memory. Cannot create SOAP 1.1 builder helper");
return NULL;
}
@@ -86,7 +88,6 @@
axiom_soap11_builder_helper_t * builder_helper,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, void);
AXIS2_FREE(env->allocator, builder_helper);
builder_helper = NULL;
@@ -106,7 +107,6 @@
axiom_soap_body_t *soap_body = NULL;
axiom_soap_fault_t *soap_fault = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_element_node, AXIS2_FAILURE);
om_ele =
@@ -324,6 +324,8 @@
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_SOAP11_FAULT_ACTOR_SHOULD_NOT_HAVE_CHILD_ELEMENTS,
AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "SOAP 1.1 Actor should not have child elements");
return AXIS2_FAILURE;
}
}
@@ -349,6 +351,8 @@
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_ONLY_CHARACTERS_ARE_ALLOWED_HERE,
AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Unidentified character in SOAP 1.1 builder helper processing");
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c?rev=639191&r1=639190&r2=639191&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c Thu Mar 20 00:54:47 2008
@@ -72,11 +72,12 @@
builder_helper =
(axiom_soap12_builder_helper_t *) AXIS2_MALLOC(env->allocator,
- sizeof
- (axiom_soap12_builder_helper_t));
+ sizeof(axiom_soap12_builder_helper_t));
if (!builder_helper)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "No memory. Cannot create SOAP 1.1 builder helper");
return NULL;
}
@@ -135,24 +136,34 @@
om_ele = (axiom_element_t *) axiom_node_get_data_element(om_ele_node, env);
if (!om_ele)
+ {
return AXIS2_FAILURE;
+ }
ele_localname = axiom_element_get_localname(om_ele, env);
if (!ele_localname)
+ {
return AXIS2_FAILURE;
+ }
soap_envelope =
axiom_soap_builder_get_soap_envelope(builder_helper->soap_builder, env);
if (!soap_envelope)
+ {
return AXIS2_FAILURE;
+ }
soap_body = axiom_soap_envelope_get_body(soap_envelope, env);
if (!soap_body)
+ {
return AXIS2_FAILURE;
+ }
soap_fault = axiom_soap_body_get_fault(soap_body, env);
if (!soap_fault)
+ {
return AXIS2_FAILURE;
+ }
if (element_level == 4)
{
@@ -164,7 +175,8 @@
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_MULTIPLE_CODE_ELEMENTS_ENCOUNTERED,
AXIS2_FAILURE);
-
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Multiple fault code elements encountered in SOAP fault");
return AXIS2_FAILURE;
}
else
@@ -200,6 +212,8 @@
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_MULTIPLE_REASON_ELEMENTS_ENCOUNTERED,
AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Multiple fault reason elements encountered in SOAP fault");
return AXIS2_FAILURE;
}
@@ -208,7 +222,9 @@
axiom_soap_fault_reason_t *fault_reason = NULL;
fault_reason = axiom_soap_fault_reason_create(env);
if (!fault_reason)
+ {
return AXIS2_FAILURE;
+ }
axiom_soap_fault_reason_set_base_node(fault_reason, env,
om_ele_node);
@@ -271,7 +287,9 @@
axiom_soap_fault_node_t *soap_fault_node = NULL;
soap_fault_node = axiom_soap_fault_node_create(env);
if (!soap_fault_node)
+ {
return AXIS2_FAILURE;
+ }
axiom_soap_fault_node_set_base_node(soap_fault_node,
env, om_ele_node);
@@ -413,16 +431,20 @@
axis2_char_t *parent_localname = NULL;
parent_node = axiom_node_get_parent(om_ele_node, env);
if (!parent_node)
+ {
return AXIS2_FAILURE;
-
+ }
parent_ele =
(axiom_element_t *) axiom_node_get_data_element(parent_node, env);
if (!parent_ele)
+ {
return AXIS2_FAILURE;
-
+ }
parent_localname = axiom_element_get_localname(parent_ele, env);
if (!parent_localname)
+ {
return AXIS2_FAILURE;
+ }
if (axutil_strcmp(parent_localname,
AXIOM_SOAP12_SOAP_FAULT_CODE_LOCAL_NAME) == 0)
@@ -532,14 +554,17 @@
soap_fault_text = axiom_soap_fault_text_create(env);
if (!soap_fault_text)
+ {
return AXIS2_FAILURE;
-
+ }
axiom_soap_fault_text_set_base_node(soap_fault_text, env,
om_ele_node);
fault_reason = axiom_soap_fault_get_reason(soap_fault, env);
if (!fault_reason)
+ {
return AXIS2_FAILURE;
+ }
axiom_soap_fault_reason_add_soap_fault_text(fault_reason, env,
soap_fault_text);
@@ -591,17 +616,21 @@
parent_node = axiom_node_get_parent(om_ele_node, env);
if (!parent_node)
+ {
return AXIS2_FAILURE;
-
+ }
parent_ele =
(axiom_element_t *) axiom_node_get_data_element(parent_node, env);
if (!parent_ele)
+ {
return AXIS2_FAILURE;
+ }
parent_localname = axiom_element_get_localname(parent_ele, env);
if (!parent_localname)
+ {
return AXIS2_FAILURE;
-
+ }
if (axutil_strcmp
(parent_localname,
AXIOM_SOAP12_SOAP_FAULT_SUB_CODE_LOCAL_NAME) == 0)
@@ -640,7 +669,9 @@
}
value = axiom_soap_fault_value_create(env);
if (!value)
+ {
return AXIS2_FAILURE;
+ }
axiom_soap_fault_value_set_base_node(value, env,
om_ele_node);
@@ -666,7 +697,9 @@
subcode = axiom_soap_fault_sub_code_create(env);
if (!subcode)
+ {
return AXIS2_FAILURE;
+ }
axiom_soap_fault_sub_code_set_base_node(subcode, env,
om_ele_node);
@@ -730,7 +763,9 @@
axis2_bool_t local_name_exists = AXIS2_FALSE;
int i = 0;
if (!(builder_helper->detail_element_names))
+ {
return AXIS2_FAILURE;
+ }
for (i = 0;
i <
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org