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/17 13:21:35 UTC
svn commit: r637856 - in /webservices/axis2/trunk/c/src/modules/mod_addr:
addr_in_handler.c addr_out_handler.c
Author: kaushalye
Date: Mon Mar 17 05:21:33 2008
New Revision: 637856
URL: http://svn.apache.org/viewvc?rev=637856&view=rev
Log:
Axis2C hackathon: Addressing handlers
Modified:
webservices/axis2/trunk/c/src/modules/mod_addr/addr_in_handler.c
webservices/axis2/trunk/c/src/modules/mod_addr/addr_out_handler.c
Modified: webservices/axis2/trunk/c/src/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/modules/mod_addr/addr_in_handler.c?rev=637856&r1=637855&r2=637856&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/src/modules/mod_addr/addr_in_handler.c Mon Mar 17 05:21:33 2008
@@ -108,7 +108,7 @@
return NULL;
}
- /* handler init is handled by conf loading, so no need to do it here */
+ /* Handler init is handled by conf loading, so no need to do it here */
axis2_handler_set_invoke(handler, env, axis2_addr_in_handler_invoke);
@@ -345,13 +345,13 @@
ele_localname = axiom_element_get_localname(header_block_ele, env);
role = axiom_soap_header_block_get_role(header_block, env);
- if (role && axutil_strcmp(role, AXIOM_SOAP12_SOAP_ROLE_NONE) == 0)
+ if (role && !axutil_strcmp(role, AXIOM_SOAP12_SOAP_ROLE_NONE))
{
/* Role is none, no need of processing */
continue;
}
- if (axutil_strcmp(ele_localname, AXIS2_WSA_TO) == 0)
+ if (!axutil_strcmp(ele_localname, AXIS2_WSA_TO))
{
/* here the addressing epr overidde what ever already there in the message context */
@@ -376,7 +376,7 @@
axiom_soap_header_block_set_processed(header_block, env);
to_found = AXIS2_TRUE;
}
- else if (axutil_strcmp(ele_localname, AXIS2_WSA_FROM) == 0)
+ else if (!axutil_strcmp(ele_localname, AXIS2_WSA_FROM))
{
epr = axis2_msg_info_headers_get_from(msg_info_headers, env);
if (!epr)
@@ -392,7 +392,7 @@
addr_ns_str);
axiom_soap_header_block_set_processed(header_block, env);
}
- else if (axutil_strcmp(ele_localname, AXIS2_WSA_REPLY_TO) == 0)
+ else if (!axutil_strcmp(ele_localname, AXIS2_WSA_REPLY_TO))
{
epr = axis2_msg_info_headers_get_reply_to(msg_info_headers, env);
@@ -416,7 +416,7 @@
axiom_soap_header_block_set_processed(header_block, env);
reply_to_found = AXIS2_TRUE;
}
- else if (axutil_strcmp(ele_localname, AXIS2_WSA_FAULT_TO) == 0)
+ else if (!axutil_strcmp(ele_localname, AXIS2_WSA_FAULT_TO))
{
epr = axis2_msg_info_headers_get_fault_to(msg_info_headers, env);
@@ -442,7 +442,7 @@
axiom_soap_header_block_set_processed(header_block, env);
fault_to_found = AXIS2_TRUE;
}
- else if (axutil_strcmp(ele_localname, AXIS2_WSA_MESSAGE_ID) == 0)
+ else if (!axutil_strcmp(ele_localname, AXIS2_WSA_MESSAGE_ID))
{
axis2_char_t *text = NULL;
@@ -463,7 +463,7 @@
axiom_soap_header_block_set_processed(header_block, env);
msg_id_found = AXIS2_TRUE;
}
- else if (axutil_strcmp(ele_localname, AXIS2_WSA_ACTION) == 0)
+ else if (!axutil_strcmp(ele_localname, AXIS2_WSA_ACTION))
{
axis2_char_t *text = NULL;
@@ -484,7 +484,7 @@
axiom_soap_header_block_set_processed(header_block, env);
action_found = AXIS2_TRUE;
}
- else if (axutil_strcmp(ele_localname, AXIS2_WSA_RELATES_TO) == 0)
+ else if (!axutil_strcmp(ele_localname, AXIS2_WSA_RELATES_TO))
{
axis2_char_t *address = NULL;
axutil_qname_t *rqn = NULL;
@@ -492,7 +492,7 @@
const axis2_char_t *relationship_type_default_value = NULL;
const axis2_char_t *relationship_type_value = NULL;
axis2_relates_to_t *relates_to = NULL;
- if (axutil_strcmp(AXIS2_WSA_NAMESPACE_SUBMISSION, addr_ns_str) == 0)
+ if (!axutil_strcmp(AXIS2_WSA_NAMESPACE_SUBMISSION, addr_ns_str))
{
relationship_type_default_value =
AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE_SUBMISSION;
@@ -673,8 +673,7 @@
if (om_attr)
{
attr_value = axiom_attribute_get_localname(om_attr, env);
- if (axutil_strcmp(attr_value, AXIS2_WSA_TYPE_ATTRIBUTE_VALUE) ==
- 0)
+ if (!axutil_strcmp(attr_value, AXIS2_WSA_TYPE_ATTRIBUTE_VALUE))
{
axis2_msg_info_headers_add_ref_param(msg_info_headers, env,
header_block_node);
@@ -739,7 +738,7 @@
{
attr_value =
axiom_attribute_get_localname(is_ref_param_attr, env);
- if (axutil_strcmp("true", attr_value) == 0)
+ if (!axutil_strcmp("true", attr_value))
{
axis2_endpoint_ref_add_ref_param(to_epr, env,
header_block_node);
@@ -773,8 +772,8 @@
exp_qn_nsuri = axutil_qname_get_localpart(expected_qname, env);
act_qn_nsuri = axutil_qname_get_localpart(actual_qname, env);
- return ((axutil_strcmp(exp_qn_lpart, act_qn_lpart) == 0) &&
- (axutil_strcmp(exp_qn_nsuri, act_qn_nsuri) == 0));
+ return ((!axutil_strcmp(exp_qn_lpart, act_qn_lpart)) &&
+ (!axutil_strcmp(exp_qn_nsuri, act_qn_nsuri)));
}
void
Modified: webservices/axis2/trunk/c/src/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/modules/mod_addr/addr_out_handler.c?rev=637856&r1=637855&r2=637856&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/src/modules/mod_addr/addr_out_handler.c Mon Mar 17 05:21:33 2008
@@ -500,9 +500,6 @@
om_attr,
relates_to_header_node);
- }
- if (relates_to_header_ele)
- {
dec_ns =
axiom_element_find_declared_namespace
(relates_to_header_ele, env, addr_ns,
@@ -599,6 +596,7 @@
axiom_node_t *header_block_node = NULL;
axiom_node_t *header_node = NULL;
axiom_namespace_t *addr_ns_obj = NULL;
+ int size = 0;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, endpoint_ref, AXIS2_FAILURE);
@@ -675,8 +673,9 @@
if (ref_attribute_list)
{
int j = 0;
- for (j = 0; j < axutil_array_list_size(ref_attribute_list, env);
- j++)
+
+ size = axutil_array_list_size(ref_attribute_list, env);
+ for (j = 0; j < size; j++)
{
axiom_attribute_t *attr =
(axiom_attribute_t *)
@@ -689,7 +688,8 @@
}
}
- for (i = 0; i < axutil_array_list_size(ref_param_list, env); i++)
+ size = axutil_array_list_size(ref_param_list, env);
+ for (i = 0; size; i++)
{
axiom_node_t *ref_node =
(axiom_node_t *) axutil_array_list_get(ref_param_list, env, i);
@@ -725,8 +725,8 @@
if (meta_attribute_list)
{
int j = 0;
- for (j = 0; j < axutil_array_list_size(meta_attribute_list, env);
- j++)
+ size = axutil_array_list_size(meta_attribute_list, env);
+ for (j = 0; j < size; j++)
{
axiom_attribute_t *attr =
(axiom_attribute_t *)
@@ -739,7 +739,8 @@
}
}
- for (i = 0; i < axutil_array_list_size(meta_data_list, env); i++)
+ size = axutil_array_list_size(meta_data_list, env);
+ for (i = 0; i < size; i++)
{
axiom_node_t *ref_node =
(axiom_node_t *) axutil_array_list_get(meta_data_list, env, i);
@@ -754,7 +755,9 @@
if (extension_list && axutil_array_list_size(extension_list, env) > 0)
{
int i = 0;
- for (i = 0; i < axutil_array_list_size(extension_list, env); i++)
+
+ size = axutil_array_list_size(extension_list, env);
+ for (i = 0; i < size; i++)
{
axiom_node_t *ref_node =
(axiom_node_t *) axutil_array_list_get(extension_list, env, i);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org