You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by da...@apache.org on 2006/12/07 05:26:55 UTC
svn commit: r483342 [5/5] - in /webservices/sandesha/trunk/c: ./ config/
include/ samples/ samples/RMSampleService/ samples/rm_echo/
samples/rm_ping/ src/ src/client/ src/core/ src/handlers/
src/msgprocessors/ src/polling/ src/util/ src/workers/ src/wsrm/
Modified: webservices/sandesha/trunk/c/src/wsrm/create_seq.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/create_seq.c?view=diff&rev=483342&r1=483341&r2=483342
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/create_seq.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/create_seq.c Wed Dec 6 20:26:47 2006
@@ -89,7 +89,7 @@
create_seq_impl = (sandesha2_create_seq_impl_t *)AXIS2_MALLOC
(env->allocator, sizeof(sandesha2_create_seq_impl_t));
- if(NULL == create_seq_impl)
+ if(!create_seq_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -104,7 +104,7 @@
create_seq_impl->create_seq.part.ops = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_iom_rm_part_ops_t));
- if(NULL == create_seq_impl->create_seq.part.ops)
+ if(!create_seq_impl->create_seq.part.ops)
{
sandesha2_create_seq_free((sandesha2_iom_rm_element_t*)
create_seq_impl, env);
@@ -113,7 +113,7 @@
}
create_seq_impl->create_seq.part.element.ops = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_iom_rm_element_ops_t));
- if(NULL == create_seq_impl->create_seq.part.element.ops)
+ if(!create_seq_impl->create_seq.part.element.ops)
{
sandesha2_create_seq_free((sandesha2_iom_rm_element_t*)
create_seq_impl, env);
@@ -198,71 +198,53 @@
static void* AXIS2_CALL
sandesha2_create_seq_from_om_node(
sandesha2_iom_rm_element_t *create_seq,
- const axis2_env_t *env, axiom_node_t *om_node)
+ const axis2_env_t *env,
+ axiom_node_t *seq_node)
{
sandesha2_create_seq_impl_t *create_seq_impl = NULL;
- axiom_element_t *om_element = NULL;
axiom_element_t *seq_part = NULL;
axiom_element_t *offer_part = NULL;
axiom_element_t *expires_part = NULL;
- axiom_node_t *seq_node = NULL;
axiom_node_t *offer_node = NULL;
axiom_node_t *expires_node = NULL;
- axis2_qname_t *seq_qname = NULL;
axis2_qname_t *offer_qname = NULL;
axis2_qname_t *expires_qname = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK(env->error, om_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, seq_node, NULL);
create_seq_impl = SANDESHA2_INTF_TO_IMPL(create_seq);
- om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
- if(NULL == om_element)
+ seq_part = AXIOM_NODE_GET_DATA_ELEMENT(seq_node, env);
+ if(!seq_part)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
- seq_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_CREATE_SEQ,
- create_seq_impl->rm_ns_val, NULL);
- if(NULL == seq_qname)
+ create_seq_impl->acks_to = sandesha2_acks_to_create(env, NULL,
+ create_seq_impl->rm_ns_val, create_seq_impl->addr_ns_val);
+ if(!create_seq_impl->acks_to)
{
return NULL;
}
- seq_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
- seq_qname, om_node, &seq_node);
- if(NULL == seq_part)
- {
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
- AXIS2_FAILURE);
- return NULL;
- }
-
- create_seq_impl->acks_to = sandesha2_acks_to_create(env, NULL,
- create_seq_impl->rm_ns_val,
- create_seq_impl->addr_ns_val);
- if(NULL == create_seq_impl->acks_to)
- {
- return NULL;
- }
- if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)create_seq_impl->acks_to,
- env, seq_node))
+ if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+ create_seq_impl->acks_to, env, seq_node))
{
return NULL;
}
offer_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ_OFFER,
- create_seq_impl->rm_ns_val, NULL);
- if(NULL == offer_qname)
+ create_seq_impl->rm_ns_val, NULL);
+ if(!offer_qname)
{
return NULL;
}
offer_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(seq_part, env,
- offer_qname, seq_node, &offer_node);
- if(NULL != offer_part)
+ offer_qname, seq_node, &offer_node);
+ if(offer_part)
{
create_seq_impl->seq_offer = sandesha2_seq_offer_create(env,
- create_seq_impl->rm_ns_val);
- if(NULL == create_seq_impl->seq_offer)
+ create_seq_impl->rm_ns_val);
+ if(!create_seq_impl->seq_offer)
{
return NULL;
}
@@ -273,24 +255,23 @@
}
}
expires_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_EXPIRES,
- create_seq_impl->rm_ns_val, NULL);
- if(NULL == expires_qname)
+ create_seq_impl->rm_ns_val, NULL);
+ if(!expires_qname)
{
return NULL;
}
expires_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(seq_part, env,
- expires_qname, seq_node, &expires_node);
- if(NULL != expires_part)
+ expires_qname, seq_node, &expires_node);
+ if(expires_part)
{
create_seq_impl->expires = sandesha2_expires_create(env,
- create_seq_impl->rm_ns_val);
- if(NULL == create_seq_impl->expires)
+ create_seq_impl->rm_ns_val);
+ if(!create_seq_impl->expires)
{
return NULL;
}
if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
- create_seq_impl->expires,
- env, seq_node))
+ create_seq_impl->expires, env, seq_node))
{
return NULL;
}
@@ -313,7 +294,7 @@
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
create_seq_impl = SANDESHA2_INTF_TO_IMPL(create_seq);
- if(NULL == create_seq_impl->acks_to)
+ if(!create_seq_impl->acks_to)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_OM_NULL_ELEMENT,
AXIS2_FAILURE);
@@ -321,24 +302,24 @@
}
rm_ns = axiom_namespace_create(env, create_seq_impl->rm_ns_val,
SANDESHA2_WSRM_COMMON_NS_PREFIX_RM);
- if(NULL == rm_ns)
+ if(!rm_ns)
{
return NULL;
}
cs_element = axiom_element_create(env, NULL,
SANDESHA2_WSRM_COMMON_CREATE_SEQ, rm_ns,
&cs_node);
- if(NULL == cs_element)
+ if(!cs_element)
{
return NULL;
}
sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)create_seq_impl->acks_to, env, cs_node);
- if(NULL != create_seq_impl->expires)
+ if(create_seq_impl->expires)
{
sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)create_seq_impl->expires, env,
cs_node);
}
- if(NULL != create_seq_impl->seq_offer)
+ if(create_seq_impl->seq_offer)
{
sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)create_seq_impl->seq_offer, env,
cs_node);
@@ -390,7 +371,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
create_seq_impl = SANDESHA2_INTF_TO_IMPL(create_seq);
- if(NULL != create_seq_impl->acks_to)
+ if(create_seq_impl->acks_to)
{
sandesha2_iom_rm_element_free((sandesha2_iom_rm_element_t*)
create_seq_impl->acks_to, env);
@@ -423,7 +404,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
create_seq_impl = SANDESHA2_INTF_TO_IMPL(create_seq);
- if(NULL != create_seq_impl->seq_offer)
+ if(create_seq_impl->seq_offer)
{
sandesha2_iom_rm_element_free((sandesha2_iom_rm_element_t*)
create_seq_impl->seq_offer, env);
@@ -452,7 +433,7 @@
create_seq_qname = axis2_qname_create(env,
SANDESHA2_WSRM_COMMON_CREATE_SEQ,
create_seq_impl->rm_ns_val, NULL);
- if(NULL == create_seq_qname)
+ if(!create_seq_qname)
{
return AXIS2_FAILURE;
}
Modified: webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c?view=diff&rev=483342&r1=483341&r2=483342
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c Wed Dec 6 20:26:47 2006
@@ -93,7 +93,7 @@
(env->allocator,
sizeof(sandesha2_create_seq_res_impl_t));
- if(NULL == create_seq_res_impl)
+ if(!create_seq_res_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -108,7 +108,7 @@
create_seq_res_impl->create_seq_res.part.ops = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_iom_rm_part_ops_t));
- if(NULL == create_seq_res_impl->create_seq_res.part.ops)
+ if(!create_seq_res_impl->create_seq_res.part.ops)
{
sandesha2_create_seq_res_free((sandesha2_iom_rm_element_t*)
create_seq_res_impl, env);
@@ -117,7 +117,7 @@
}
create_seq_res_impl->create_seq_res.part.element.ops = AXIS2_MALLOC(
env->allocator, sizeof(sandesha2_iom_rm_element_ops_t));
- if(NULL == create_seq_res_impl->create_seq_res.part.element.ops)
+ if(!create_seq_res_impl->create_seq_res.part.element.ops)
{
sandesha2_create_seq_res_free((sandesha2_iom_rm_element_t*)
create_seq_res_impl, env);
@@ -190,70 +190,53 @@
static void* AXIS2_CALL
sandesha2_create_seq_res_from_om_node(
sandesha2_iom_rm_element_t *create_seq_res,
- const axis2_env_t *env, axiom_node_t *om_node)
+ const axis2_env_t *env,
+ axiom_node_t *csr_node)
{
sandesha2_create_seq_res_impl_t *create_seq_res_impl = NULL;
- axiom_element_t *om_element = NULL;
axiom_element_t *csr_part = NULL;
axiom_element_t *exp_part = NULL;
axiom_element_t *acc_part = NULL;
- axiom_node_t *csr_node = NULL;
axiom_node_t *exp_node = NULL;
axiom_node_t *acc_node = NULL;
- axis2_qname_t *csr_qname = NULL;
axis2_qname_t *exp_qname = NULL;
axis2_qname_t *acc_qname = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK(env->error, om_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, csr_node, NULL);
create_seq_res_impl = SANDESHA2_INTF_TO_IMPL(create_seq_res);
- om_element =AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
- if(NULL == om_element)
- {
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
- AXIS2_FAILURE);
- return NULL;
- }
- csr_qname = axis2_qname_create(env,
- SANDESHA2_WSRM_COMMON_CREATE_SEQ_RESPONSE,
- create_seq_res_impl->rm_ns_val, NULL);
- if(NULL == csr_qname)
- {
- return NULL;
- }
- csr_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
- csr_qname, om_node, &csr_node);
- if(NULL == csr_part)
+ csr_part =AXIOM_NODE_GET_DATA_ELEMENT(csr_node, env);
+ if(!csr_part)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
create_seq_res_impl->identifier = sandesha2_identifier_create(env,
- create_seq_res_impl->rm_ns_val);
- if(NULL == create_seq_res_impl->identifier)
+ create_seq_res_impl->rm_ns_val);
+ if(!create_seq_res_impl->identifier)
{
return NULL;
}
- if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)create_seq_res_impl->identifier,
- env, csr_node))
+ if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+ create_seq_res_impl->identifier, env, csr_node))
{
return NULL;
}
exp_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_EXPIRES,
- create_seq_res_impl->rm_ns_val, NULL);
- if(NULL == exp_qname)
+ create_seq_res_impl->rm_ns_val, NULL);
+ if(!exp_qname)
{
return NULL;
}
- exp_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(csr_part, env,
- csr_qname, csr_node, &exp_node);
- if(NULL != exp_part)
+ exp_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(csr_part, env,
+ exp_qname, csr_node, &exp_node);
+ if(exp_part)
{
create_seq_res_impl->expires = sandesha2_expires_create(env,
create_seq_res_impl->rm_ns_val);
- if(NULL == create_seq_res_impl->expires)
+ if(!create_seq_res_impl->expires)
{
return NULL;
}
@@ -264,24 +247,23 @@
}
}
acc_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_ACCEPT,
- create_seq_res_impl->rm_ns_val, NULL);
- if(NULL == acc_qname)
+ create_seq_res_impl->rm_ns_val, NULL);
+ if(!acc_qname)
{
return NULL;
}
acc_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(csr_part, env,
- acc_qname, csr_node, &acc_node);
- if(NULL != acc_part)
+ acc_qname, csr_node, &acc_node);
+ if(acc_part)
{
create_seq_res_impl->accept = sandesha2_accept_create(env,
- create_seq_res_impl->rm_ns_val,
- create_seq_res_impl->addr_ns_val);
- if(NULL == create_seq_res_impl->accept)
+ create_seq_res_impl->rm_ns_val, create_seq_res_impl->addr_ns_val);
+ if(!create_seq_res_impl->accept)
{
return NULL;
}
if(!sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
- create_seq_res_impl->accept, env, csr_node))
+ create_seq_res_impl->accept, env, csr_node))
{
return NULL;
}
@@ -305,7 +287,7 @@
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
create_seq_res_impl = SANDESHA2_INTF_TO_IMPL(create_seq_res);
- if(NULL == create_seq_res_impl->identifier)
+ if(!create_seq_res_impl->identifier)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_OM_NULL_ELEMENT,
AXIS2_FAILURE);
@@ -313,25 +295,25 @@
}
rm_ns = axiom_namespace_create(env, create_seq_res_impl->rm_ns_val,
SANDESHA2_WSRM_COMMON_NS_PREFIX_RM);
- if(NULL == rm_ns)
+ if(!rm_ns)
{
return NULL;
}
csr_element = axiom_element_create(env, NULL,
SANDESHA2_WSRM_COMMON_CREATE_SEQ_RESPONSE, rm_ns,
&csr_node);
- if(NULL == csr_element)
+ if(!csr_element)
{
return NULL;
}
sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)create_seq_res_impl->identifier, env,
csr_node);
- if(NULL != create_seq_res_impl->accept)
+ if(create_seq_res_impl->accept)
{
sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)create_seq_res_impl->accept, env,
csr_node);
}
- if(NULL != create_seq_res_impl->expires)
+ if(create_seq_res_impl->expires)
{
sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)create_seq_res_impl->expires, env,
csr_node);
@@ -459,7 +441,7 @@
create_seq_res_qname = axis2_qname_create(env,
SANDESHA2_WSRM_COMMON_CREATE_SEQ_RESPONSE,
create_seq_res_impl->rm_ns_val, NULL);
- if(NULL == create_seq_res_qname)
+ if(!create_seq_res_qname)
{
return AXIS2_FAILURE;
}
Modified: webservices/sandesha/trunk/c/src/wsrm/identifier.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/identifier.c?view=diff&rev=483342&r1=483341&r2=483342
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/identifier.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/identifier.c Wed Dec 6 20:26:47 2006
@@ -287,13 +287,14 @@
axis2_status_t AXIS2_CALL
sandesha2_identifier_set_identifier(
sandesha2_identifier_t *identifier,
- const axis2_env_t *env, axis2_char_t *str_id)
+ const axis2_env_t *env,
+ axis2_char_t *str_id)
{
sandesha2_identifier_impl_t *identifier_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
identifier_impl = SANDESHA2_INTF_TO_IMPL(identifier);
- if(NULL != identifier_impl->str_id)
+ if(identifier_impl->str_id)
{
AXIS2_FREE(env->allocator, identifier_impl->str_id);
identifier_impl->str_id = NULL;
Modified: webservices/sandesha/trunk/c/src/wsrm/make_connection.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/make_connection.c?view=diff&rev=483342&r1=483341&r2=483342
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/make_connection.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/make_connection.c Wed Dec 6 20:26:47 2006
@@ -19,6 +19,7 @@
#include <axiom_soap_header.h>
#include <axiom_soap_body.h>
#include <axiom_soap_header_block.h>
+#include <stdio.h>
/**
* @brief Make Connection struct impl
@@ -75,7 +76,9 @@
/***************************** End of function headers ************************/
AXIS2_EXTERN sandesha2_make_connection_t* AXIS2_CALL
-sandesha2_make_connection_create(const axis2_env_t *env, axis2_char_t *ns_val)
+sandesha2_make_connection_create(
+ const axis2_env_t *env,
+ axis2_char_t *ns_val)
{
sandesha2_make_connection_impl_t *make_conn_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -247,7 +250,7 @@
return NULL;
}
sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
- make_conn_impl->identifier, env, identifier_node);
+ make_conn_impl->identifier, env, om_node);
}
if(address_element)
{
@@ -258,7 +261,7 @@
return NULL;
}
sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
- make_conn_impl->address, env, address_node);
+ make_conn_impl->address, env, om_node);
}
return make_conn;
}
Modified: webservices/sandesha/trunk/c/src/wsrm/msg_pending.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/msg_pending.c?view=diff&rev=483342&r1=483341&r2=483342
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/msg_pending.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/msg_pending.c Wed Dec 6 20:26:47 2006
@@ -58,12 +58,6 @@
sandesha2_iom_rm_element_t *msg_pending,
const axis2_env_t *env,
axis2_char_t *namespace);
-
-static axis2_status_t AXIS2_CALL
-sandesha2_msg_pending_to_soap_envelope(
- sandesha2_iom_rm_part_t *msg_pending,
- const axis2_env_t *env,
- axiom_soap_envelope_t *envelope);
static axis2_status_t AXIS2_CALL
sandesha2_msg_pending_free (
@@ -79,7 +73,6 @@
{
sandesha2_msg_pending_impl_t *msg_pending_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK(env->error, ns_val, NULL);
if(AXIS2_FALSE == sandesha2_msg_pending_is_namespace_supported(
(sandesha2_iom_rm_element_t*)msg_pending_impl, env,
@@ -208,17 +201,18 @@
return NULL;
}
pending_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_PENDING,
- msg_pending_impl->ns_val, NULL);
+ NULL, NULL);
if(!pending_qname)
{
return NULL;
}
- pending_attr = AXIOM_ELEMENT_GET_ATTRIBUTE(msg_pending_element, env, pending_qname);
+ pending_attr = AXIOM_ELEMENT_GET_ATTRIBUTE(msg_pending_element, env,
+ pending_qname);
if(!pending_attr)
{
- AXIS2_ERROR_LOG(env->log, AXIS2_LOG_SI, "MessagePending header must" \
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "MessagePending header must" \
"have an attribute named 'pending'");
- SANDESHA2_ERROR_SET(env->error,
+ AXIS2_ERROR_SET(env->error,
SANDESHA2_ERROR_PENDING_HEADER_MUST_HAVE_ATTRIBUTE_PENDING,
AXIS2_FAILURE);
}
@@ -229,9 +223,9 @@
pending = AXIS2_FALSE;
else
{
- AXIS2_ERROR_LOG(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"Attribute 'pending' must have value 'true' or 'false'");
- SANDESHA2_ERROR_SET(env->error,
+ AXIS2_ERROR_SET(env->error,
SANDESHA2_ERROR_ATTRIBUTE_PENDING_MUST_HAVE_VALUE_TRUE_OR_FALSE,
AXIS2_FAILURE);
@@ -250,6 +244,8 @@
axiom_soap_header_t *soap_header = NULL;
axiom_soap_header_block_t *msg_pending_block = NULL;
axiom_node_t *msg_pending_node = NULL;
+ axiom_element_t *msg_pending_element = NULL;
+ axiom_attribute_t *pending_attr = NULL;
axis2_char_t *attr_value = NULL;
axis2_bool_t pending = AXIS2_FALSE;
@@ -259,7 +255,7 @@
msg_pending_impl = SANDESHA2_INTF_TO_IMPL(msg_pending);
soap_header = (axiom_soap_header_t*)header_node;
rm_ns = axiom_namespace_create(env, msg_pending_impl->ns_val,
- SANDESHA2_WSRM_COMMON_NS_PREFIX_RM);
+ SANDESHA2_WSRM_COMMON_NS_PREFIX_RM);
if(!rm_ns)
{
return NULL;
@@ -270,13 +266,17 @@
{
return NULL;
}
- msg_pending_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(msg_pending_block, env);
+ msg_pending_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(msg_pending_block,
+ env);
+ msg_pending_element = AXIOM_NODE_GET_DATA_ELEMENT(msg_pending_node, env);
if(pending)
attr_value = SANDESHA2_VALUE_TRUE;
else if(!pending)
attr_value = SANDESHA2_VALUE_FALSE;
- AXIOM_SOAP_HEADER_BLOCK_SET_ATTRIBUTE(msg_pending_block, env,
- SANDESHA2_WSRM_COMMON_MESSAGE_PENDING, attr_value, NULL);
+ pending_attr = axiom_attribute_create(env,
+ SANDESHA2_WSRM_COMMON_PENDING, attr_value, NULL);
+ AXIOM_ELEMENT_ADD_ATTRIBUTE(msg_pending_element, env, pending_attr,
+ msg_pending_node);
return header_node;
}
@@ -325,7 +325,7 @@
return AXIS2_SUCCESS;
}
-static axis2_status_t AXIS2_CALL
+axis2_status_t AXIS2_CALL
sandesha2_msg_pending_to_soap_envelope(
sandesha2_iom_rm_part_t *msg_pending,
const axis2_env_t *env,
Modified: webservices/sandesha/trunk/c/src/wsrm/rm_elements.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/rm_elements.c?view=diff&rev=483342&r1=483341&r2=483342
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/rm_elements.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/rm_elements.c Wed Dec 6 20:26:47 2006
@@ -128,6 +128,10 @@
axiom_node_t *close_seq_res_node = NULL;
axiom_element_t *ack_requested_element = NULL;
axiom_node_t *ack_requested_node = NULL;
+ axiom_element_t *make_conn_element = NULL;
+ axiom_node_t *make_conn_node = NULL;
+ axiom_element_t *msg_pending_element = NULL;
+ axiom_node_t *msg_pending_node = NULL;
axis2_qname_t *qname = NULL;
axis2_char_t *rm_ns_val = NULL;
axis2_char_t *addr_ns_val = NULL;
@@ -172,7 +176,7 @@
{
rm_elements->seq = sandesha2_seq_create(env, rm_ns_val);
sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
- rm_elements->seq, env, header_node);
+ rm_elements->seq, env, seq_node);
}
qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ_ACK, rm_ns_val,
NULL);
@@ -182,7 +186,7 @@
{
rm_elements->seq_ack = sandesha2_seq_ack_create(env, rm_ns_val);
sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
- rm_elements->seq_ack, env, header_node);
+ rm_elements->seq_ack, env, seq_ack_node);
}
qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_CREATE_SEQ, rm_ns_val,
NULL);
@@ -193,85 +197,99 @@
rm_elements->create_seq = sandesha2_create_seq_create(env,
addr_ns_val, rm_ns_val);
sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
- rm_elements->create_seq, env, body_node);
+ rm_elements->create_seq, env, create_seq_node);
}
qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_CREATE_SEQ_RESPONSE,
rm_ns_val, NULL);
create_seq_res_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
- body_element, env, qname, body_node,
- &create_seq_res_node);
+ body_element, env, qname, body_node, &create_seq_res_node);
if(create_seq_res_node)
{
rm_elements->create_seq_res = sandesha2_create_seq_res_create(env,
rm_ns_val, addr_ns_val);
sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
- rm_elements->create_seq_res, env, body_node);
+ rm_elements->create_seq_res, env, create_seq_res_node);
}
qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_TERMINATE_SEQ,
rm_ns_val, NULL);
terminate_seq_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
- body_element, env, qname, body_node,
- &terminate_seq_node);
+ body_element, env, qname, body_node, &terminate_seq_node);
if(terminate_seq_node)
{
rm_elements->terminate_seq = sandesha2_terminate_seq_create(env,
- rm_ns_val);
+ rm_ns_val);
sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
- rm_elements->terminate_seq, env, body_node);
+ rm_elements->terminate_seq, env, terminate_seq_node);
}
qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_TERMINATE_SEQ_RESPONSE,
- rm_ns_val, NULL);
+ rm_ns_val, NULL);
terminate_seq_res_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
- body_element, env, qname, body_node,
- &terminate_seq_res_node);
+ body_element, env, qname, body_node, &terminate_seq_res_node);
if(terminate_seq_res_node)
{
rm_elements->terminate_seq_res = sandesha2_terminate_seq_res_create(
- env, rm_ns_val);
+ env, rm_ns_val);
sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
- rm_elements->terminate_seq_res, env, body_node);
+ rm_elements->terminate_seq_res, env, terminate_seq_res_node);
}
- qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_CLOSE_SEQ,
- rm_ns_val, NULL);
- close_seq_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
- body_element, env, qname, body_node,
- &close_seq_node);
+ qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_CLOSE_SEQ, rm_ns_val,
+ NULL);
+ close_seq_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(body_element,
+ env, qname, body_node, &close_seq_node);
if(close_seq_node)
{
- rm_elements->close_seq = sandesha2_close_seq_create(env,
- rm_ns_val);
+ rm_elements->close_seq = sandesha2_close_seq_create(env, rm_ns_val);
sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
- rm_elements->close_seq, env, body_node);
+ rm_elements->close_seq, env, close_seq_node);
}
qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_CLOSE_SEQ_RESPONSE,
rm_ns_val, NULL);
close_seq_res_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
- body_element, env, qname, body_node,
- &close_seq_res_node);
+ body_element, env, qname, body_node, &close_seq_res_node);
if(close_seq_res_node)
{
rm_elements->close_seq_res = sandesha2_close_seq_res_create(env,
- rm_ns_val);
+ rm_ns_val);
sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
- rm_elements->close_seq_res, env, body_node);
+ rm_elements->close_seq_res, env, close_seq_res_node);
+ }
+ qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_MAKE_CONNECTION,
+ rm_ns_val, NULL);
+ make_conn_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(body_element,
+ env, qname, body_node, &make_conn_node);
+ if(make_conn_node)
+ {
+ rm_elements->make_connection = sandesha2_make_connection_create(env,
+ rm_ns_val);
+ sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+ rm_elements->make_connection, env, make_conn_node);
}
-
qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_ACK_REQUESTED,
rm_ns_val, NULL);
ack_requested_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
- header_element, env, qname, header_node,
- &ack_requested_node);
+ header_element, env, qname, header_node, &ack_requested_node);
if(ack_requested_node)
{
rm_elements->ack_requested = sandesha2_ack_requested_create(env,
+ rm_ns_val);
+ sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+ rm_elements->ack_requested, env, ack_requested_node);
+ }
+ qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_MESSAGE_PENDING,
+ rm_ns_val, NULL);
+ msg_pending_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+ header_element, env, qname, header_node, &msg_pending_node);
+ if(msg_pending_node)
+ {
+ rm_elements->msg_pending = sandesha2_msg_pending_create(env,
rm_ns_val);
sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
- rm_elements->ack_requested, env, header_node);
+ rm_elements->msg_pending, env, msg_pending_node);
}
return AXIS2_SUCCESS;
}
@@ -304,6 +322,11 @@
sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)
rm_elements->seq_ack, env, soap_header);
}
+ if(rm_elements->msg_pending)
+ {
+ sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)
+ rm_elements->msg_pending, env, soap_header);
+ }
if(rm_elements->create_seq)
{
sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)
@@ -334,6 +357,11 @@
sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)
rm_elements->close_seq_res, env, body_node);
}
+ if(rm_elements->make_connection)
+ {
+ sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)
+ rm_elements->make_connection, env, body_node);
+ }
return soap_envelope;
}
@@ -584,12 +612,11 @@
axis2_array_list_t *headers = NULL;
headers = AXIOM_SOAP_HEADER_GET_HEADER_BLOCKS_WITH_NAMESPACE_URI(
- soap_header, env, SANDESHA2_SPEC_2005_02_NS_URI);
+ soap_header, env, SANDESHA2_SPEC_2005_02_NS_URI);
if(headers && 0 < AXIS2_ARRAY_LIST_SIZE(headers, env))
return SANDESHA2_SPEC_2005_02_NS_URI;
headers = AXIOM_SOAP_HEADER_GET_HEADER_BLOCKS_WITH_NAMESPACE_URI(
- soap_header, env, SANDESHA2_SPEC_2006_08_NS_URI);
-
+ soap_header, env, SANDESHA2_SPEC_2006_08_NS_URI);
if(headers && 0 < AXIS2_ARRAY_LIST_SIZE(headers, env))
return SANDESHA2_SPEC_2006_08_NS_URI;
}
@@ -619,6 +646,8 @@
return SANDESHA2_SPEC_2006_08_NS_URI;
if(0 == AXIS2_STRCMP(action, SANDESHA2_SPEC_2006_08_ACTION_CLOSE_SEQ_RESPONSE))
return SANDESHA2_SPEC_2006_08_NS_URI;
+ if(0 == AXIS2_STRCMP(action, SANDESHA2_SPEC_2006_08_ACTION_MAKE_CONNECTION))
+ return SANDESHA2_SPEC_2006_08_NS_URI;
return NULL;
@@ -641,17 +670,30 @@
if(soap_header)
{
axis2_array_list_t *headers = NULL;
-
+ axiom_node_t *soap_header_node = NULL;
+ axiom_element_t *soap_header_element = NULL;
+ axiom_namespace_t *addr_ns = NULL;
+
headers = AXIOM_SOAP_HEADER_GET_HEADER_BLOCKS_WITH_NAMESPACE_URI(
soap_header, env, AXIS2_WSA_NAMESPACE);
if(headers && 0 < AXIS2_ARRAY_LIST_SIZE(headers, env))
return AXIS2_WSA_NAMESPACE;
headers = AXIOM_SOAP_HEADER_GET_HEADER_BLOCKS_WITH_NAMESPACE_URI(
- soap_header, env, AXIS2_WSA_NAMESPACE_SUBMISSION);
-
+ soap_header, env, AXIS2_WSA_NAMESPACE_SUBMISSION);
if(headers && 0 < AXIS2_ARRAY_LIST_SIZE(headers, env))
return AXIS2_WSA_NAMESPACE_SUBMISSION;
+
+ soap_header_node = AXIOM_SOAP_HEADER_GET_BASE_NODE(soap_header, env);
+ soap_header_element = AXIOM_NODE_GET_DATA_ELEMENT(soap_header_node,
+ env);
+ addr_ns = AXIOM_ELEMENT_GET_NAMESPACE(soap_header_element, env,
+ soap_header_node);
+ if(addr_ns)
+ {
+ axis2_char_t *str_addr_ns = AXIOM_NAMESPACE_GET_URI(addr_ns, env);
+ return str_addr_ns;
+ }
}
return NULL;
}
Modified: webservices/sandesha/trunk/c/src/wsrm/seq_ack.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_ack.c?view=diff&rev=483342&r1=483341&r2=483342
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_ack.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_ack.c Wed Dec 6 20:26:47 2006
@@ -201,15 +201,12 @@
sandesha2_seq_ack_from_om_node(
sandesha2_iom_rm_element_t *seq_ack,
const axis2_env_t *env,
- axiom_node_t *om_node)
+ axiom_node_t *sa_node)
{
sandesha2_seq_ack_impl_t *seq_ack_impl = NULL;
- axiom_element_t *om_element = NULL;
axiom_element_t *sa_part = NULL;
- axiom_node_t *sa_node = NULL;
axiom_children_qname_iterator_t *ack_iter = NULL;
axiom_children_qname_iterator_t *nack_iter= NULL;
- axis2_qname_t *sa_qname = NULL;
axis2_qname_t *ack_range_qname = NULL;
axis2_qname_t *nack_qname = NULL;
axis2_char_t *rm_spec_ver = NULL;
@@ -217,28 +214,14 @@
axis2_char_t *prefix = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK(env->error, om_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, sa_node, NULL);
seq_ack_impl = SANDESHA2_INTF_TO_IMPL(seq_ack);
- om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
- if(!om_element)
- {
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
- AXIS2_FAILURE);
- return NULL;
- }
- sa_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ_ACK,
- seq_ack_impl->ns_val, NULL);
- if(!sa_qname)
- {
- return NULL;
- }
- sa_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
- sa_qname, om_node, &sa_node);
+ sa_part = AXIOM_NODE_GET_DATA_ELEMENT(sa_node, env);
if(!sa_part)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
rm_ns = AXIOM_ELEMENT_GET_NAMESPACE(sa_part, env, sa_node);
@@ -249,51 +232,52 @@
{
return NULL;
}
- sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)seq_ack_impl->identifier,
- env, sa_node);
+ sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+ seq_ack_impl->identifier, env, sa_node);
ack_range_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_ACK_RANGE,
- seq_ack_impl->ns_val, prefix);
+ seq_ack_impl->ns_val, prefix);
if(!ack_range_qname)
{
return NULL;
}
ack_iter = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(sa_part, env,
- ack_range_qname, sa_node);
+ ack_range_qname, sa_node);
if(!ack_iter)
{
return NULL;
}
- while(AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(ack_iter,
- env))
+ while(AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(ack_iter, env))
{
axiom_node_t *ack_node = NULL;
sandesha2_ack_range_t *ack_range = NULL;
ack_node = AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(ack_iter, env);
if(ack_node)
{
- ack_range = sandesha2_ack_range_create(env, seq_ack_impl->ns_val, prefix);
+ ack_range = sandesha2_ack_range_create(env, seq_ack_impl->ns_val,
+ prefix);
if(!ack_range)
{
return NULL;
}
- if(sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)ack_range, env, ack_node))
- AXIS2_ARRAY_LIST_ADD(seq_ack_impl->ack_range_list, env, ack_range);
+ if(sandesha2_iom_rm_element_from_om_node
+ ((sandesha2_iom_rm_element_t *)ack_range, env, ack_node))
+ AXIS2_ARRAY_LIST_ADD(seq_ack_impl->ack_range_list, env,
+ ack_range);
}
}
nack_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_NACK,
- seq_ack_impl->ns_val, NULL);
+ seq_ack_impl->ns_val, NULL);
if(!nack_qname)
{
return NULL;
}
- nack_iter = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(sa_part, env,
- nack_qname, sa_node);
+ nack_iter = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(sa_part, env, nack_qname,
+ sa_node);
if(!nack_iter)
{
return NULL;
}
- while(AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(nack_iter,
- env))
+ while(AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(nack_iter, env))
{
axiom_node_t *nack_node = NULL;
sandesha2_nack_t *nack = NULL;
@@ -305,50 +289,49 @@
{
return NULL;
}
- sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)nack, env, nack_node);
+ sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+ nack, env, nack_node);
AXIS2_ARRAY_LIST_ADD(seq_ack_impl->nack_list, env, nack);
}
}
- rm_spec_ver = sandesha2_spec_specific_consts_get_spec_ver_str(env,
- seq_ack_impl->ns_val);
- if(sandesha2_spec_specific_consts_is_ack_final_allowed(env,
- rm_spec_ver))
+ rm_spec_ver = sandesha2_spec_specific_consts_get_spec_ver_str(env,
+ seq_ack_impl->ns_val);
+ if(sandesha2_spec_specific_consts_is_ack_final_allowed(env, rm_spec_ver))
{
axiom_element_t *af_part = NULL;
axiom_node_t *af_node = NULL;
axis2_qname_t *af_qname = NULL;
af_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_FINAL,
- seq_ack_impl->ns_val, NULL);
+ seq_ack_impl->ns_val, NULL);
if(!af_qname)
{
return NULL;
}
af_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(sa_part, env,
- af_qname, sa_node, &af_node);
+ af_qname, sa_node, &af_node);
if(af_part)
{
seq_ack_impl->ack_final = sandesha2_ack_final_create(env,
- seq_ack_impl->ns_val);
+ seq_ack_impl->ns_val);
if(!seq_ack_impl->ack_final)
{
return NULL;
}
- sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)seq_ack_impl->ack_final, env,
- sa_node);
+ sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+ seq_ack_impl->ack_final, env, sa_node);
}
}
- if(sandesha2_spec_specific_consts_is_ack_none_allowed(env,
- rm_spec_ver))
+ if(sandesha2_spec_specific_consts_is_ack_none_allowed(env, rm_spec_ver))
{
axiom_element_t *an_part = NULL;
axiom_node_t *an_node = NULL;
axis2_qname_t *an_qname = NULL;
an_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_NONE,
- seq_ack_impl->ns_val, NULL);
+ seq_ack_impl->ns_val, NULL);
an_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(sa_part, env,
- an_qname, sa_node, &an_node);
+ an_qname, sa_node, &an_node);
if(an_part)
{
if(!an_qname)
@@ -356,13 +339,13 @@
return NULL;
}
seq_ack_impl->ack_none = sandesha2_ack_none_create(env,
- seq_ack_impl->ns_val);
+ seq_ack_impl->ns_val);
if(!seq_ack_impl->ack_none)
{
return NULL;
}
- sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)seq_ack_impl->ack_none, env,
- sa_node);
+ sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+ seq_ack_impl->ack_none, env, sa_node);
}
}
return seq_ack;
Modified: webservices/sandesha/trunk/c/src/wsrm/sequence.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/sequence.c?view=diff&rev=483342&r1=483341&r2=483342
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/sequence.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/sequence.c Wed Dec 6 20:26:47 2006
@@ -196,75 +196,57 @@
sandesha2_seq_from_om_node(
sandesha2_iom_rm_element_t *seq,
const axis2_env_t *env,
- axiom_node_t *om_node)
+ axiom_node_t *seq_node)
{
sandesha2_seq_impl_t *seq_impl = NULL;
- axiom_element_t *om_element = NULL;
axiom_element_t *seq_part = NULL;
axiom_element_t *lm_part = NULL;
- axiom_node_t *seq_node = NULL;
axiom_node_t *lm_node = NULL;
- axis2_qname_t *seq_qname = NULL;
axis2_qname_t *lm_qname = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK(env->error, om_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, seq_node, NULL);
seq_impl = SANDESHA2_INTF_TO_IMPL(seq);
- om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
- if(!om_element)
- {
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
- AXIS2_FAILURE);
- return NULL;
- }
- seq_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ,
- seq_impl->ns_val, NULL);
- if(!seq_qname)
- {
- return NULL;
- }
- seq_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
- seq_qname, om_node, &seq_node);
+ seq_part = AXIOM_NODE_GET_DATA_ELEMENT(seq_node, env);
if(!seq_part)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
- seq_impl->identifier = sandesha2_identifier_create(env,
- seq_impl->ns_val);
+ seq_impl->identifier = sandesha2_identifier_create(env, seq_impl->ns_val);
if(!seq_impl->identifier)
{
return NULL;
}
- sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)seq_impl->identifier, env,
- seq_node);
- seq_impl->msg_num= sandesha2_msg_number_create(env,
- seq_impl->ns_val);
+ sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+ seq_impl->identifier, env, seq_node);
+ seq_impl->msg_num= sandesha2_msg_number_create(env, seq_impl->ns_val);
if(!seq_impl->msg_num)
{
return NULL;
}
- sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)seq_impl->msg_num, env, seq_node);
+ sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+ seq_impl->msg_num, env, seq_node);
lm_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_LAST_MSG,
- seq_impl->ns_val, NULL);
+ seq_impl->ns_val, NULL);
if(!lm_qname)
{
return NULL;
}
lm_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(seq_part, env,
- lm_qname, seq_node, &lm_node);
+ lm_qname, seq_node, &lm_node);
if(lm_part)
{
seq_impl->last_msg = sandesha2_last_msg_create(env,
- seq_impl->ns_val);
+ seq_impl->ns_val);
if(!seq_impl->last_msg)
{
return NULL;
}
- sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)seq_impl->last_msg, env,
- lm_node);
+ sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+ seq_impl->last_msg, env, lm_node);
}
return seq;
}
Modified: webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c?view=diff&rev=483342&r1=483341&r2=483342
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c Wed Dec 6 20:26:47 2006
@@ -83,7 +83,7 @@
terminate_seq_impl = (sandesha2_terminate_seq_impl_t *)AXIS2_MALLOC
(env->allocator, sizeof(sandesha2_terminate_seq_impl_t));
- if(NULL == terminate_seq_impl)
+ if(!terminate_seq_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -95,7 +95,7 @@
terminate_seq_impl->terminate_seq.part.ops = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_iom_rm_part_ops_t));
- if(NULL == terminate_seq_impl->terminate_seq.part.ops)
+ if(!terminate_seq_impl->terminate_seq.part.ops)
{
sandesha2_terminate_seq_free((sandesha2_iom_rm_element_t*)
terminate_seq_impl, env);
@@ -104,7 +104,7 @@
}
terminate_seq_impl->terminate_seq.part.element.ops = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_iom_rm_element_ops_t));
- if(NULL == terminate_seq_impl->terminate_seq.part.element.ops)
+ if(!terminate_seq_impl->terminate_seq.part.element.ops)
{
sandesha2_terminate_seq_free((sandesha2_iom_rm_element_t*)
terminate_seq_impl, env);
@@ -138,13 +138,13 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
terminate_seq_impl = SANDESHA2_INTF_TO_IMPL(terminate_seq);
- if(NULL != terminate_seq_impl->ns_val)
+ if(terminate_seq_impl->ns_val)
{
AXIS2_FREE(env->allocator, terminate_seq_impl->ns_val);
terminate_seq_impl->ns_val = NULL;
}
terminate_seq_impl->identifier = NULL;
- if(NULL != terminate_seq_impl->terminate_seq.part.ops)
+ if(terminate_seq_impl->terminate_seq.part.ops)
{
AXIS2_FREE(env->allocator, terminate_seq_impl->terminate_seq.part.ops);
terminate_seq_impl->terminate_seq.part.ops = NULL;
@@ -167,48 +167,33 @@
void* AXIS2_CALL
-sandesha2_terminate_seq_from_om_node(sandesha2_iom_rm_element_t *terminate_seq,
- const axis2_env_t *env, axiom_node_t *om_node)
+sandesha2_terminate_seq_from_om_node(
+ sandesha2_iom_rm_element_t *terminate_seq,
+ const axis2_env_t *env,
+ axiom_node_t *ts_node)
{
sandesha2_terminate_seq_impl_t *terminate_seq_impl = NULL;
- axiom_element_t *om_element = NULL;
axiom_element_t *ts_part = NULL;
- axiom_node_t *ts_node = NULL;
- axis2_qname_t *ts_qname = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK(env->error, om_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, ts_node, NULL);
terminate_seq_impl = SANDESHA2_INTF_TO_IMPL(terminate_seq);
- om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
- if(NULL == om_element)
+ ts_part = AXIOM_NODE_GET_DATA_ELEMENT(ts_node, env);
+ if(!ts_part)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
- AXIS2_FAILURE);
- return NULL;
- }
- ts_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_TERMINATE_SEQ,
- terminate_seq_impl->ns_val, NULL);
- if(NULL == ts_qname)
- {
- return NULL;
- }
- ts_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
- ts_qname, om_node, &ts_node);
- if(NULL == ts_part)
- {
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
terminate_seq_impl->identifier = sandesha2_identifier_create(env,
- terminate_seq_impl->ns_val);
- if(NULL == terminate_seq_impl->identifier)
+ terminate_seq_impl->ns_val);
+ if(!terminate_seq_impl->identifier)
{
return NULL;
}
- sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)terminate_seq_impl->identifier, env,
- ts_node);
+ sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+ terminate_seq_impl->identifier, env, ts_node);
return terminate_seq;
}
@@ -226,7 +211,7 @@
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
terminate_seq_impl = SANDESHA2_INTF_TO_IMPL(terminate_seq);
- if(NULL == terminate_seq_impl->identifier)
+ if(!terminate_seq_impl->identifier)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_OM_NULL_ELEMENT,
AXIS2_FAILURE);
@@ -234,14 +219,14 @@
}
rm_ns = axiom_namespace_create(env, terminate_seq_impl->ns_val,
SANDESHA2_WSRM_COMMON_NS_PREFIX_RM);
- if(NULL == rm_ns)
+ if(!rm_ns)
{
return NULL;
}
ts_element = axiom_element_create(env, NULL,
SANDESHA2_WSRM_COMMON_TERMINATE_SEQ, rm_ns,
&ts_node);
- if(NULL == ts_element)
+ if(!ts_element)
{
return NULL;
}
@@ -294,7 +279,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
terminate_seq_impl = SANDESHA2_INTF_TO_IMPL(terminate_seq);
- if(NULL != terminate_seq_impl->identifier)
+ if(terminate_seq_impl->identifier)
{
/* SANDESHA2_IDENTIFIER_FREE(terminate_seq_impl->identifier, env);
terminate_seq_impl->identifier = NULL; */
@@ -321,7 +306,7 @@
ts_qname = axis2_qname_create(env,
SANDESHA2_WSRM_COMMON_TERMINATE_SEQ,
terminate_seq_impl->ns_val, NULL);
- if(NULL == ts_qname)
+ if(!ts_qname)
{
return AXIS2_FAILURE;
}
Modified: webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c?view=diff&rev=483342&r1=483341&r2=483342
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c Wed Dec 6 20:26:47 2006
@@ -91,7 +91,7 @@
(env->allocator,
sizeof(sandesha2_terminate_seq_res_impl_t));
- if(NULL == terminate_seq_res_impl)
+ if(!terminate_seq_res_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -104,7 +104,7 @@
terminate_seq_res_impl->terminate_seq_res.part.ops = AXIS2_MALLOC(
env->allocator,
sizeof(sandesha2_iom_rm_part_ops_t));
- if(NULL == terminate_seq_res_impl->terminate_seq_res.part.ops)
+ if(!terminate_seq_res_impl->terminate_seq_res.part.ops)
{
sandesha2_terminate_seq_res_free((sandesha2_iom_rm_element_t*)
terminate_seq_res_impl, env);
@@ -144,13 +144,13 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
terminate_seq_res_impl = SANDESHA2_INTF_TO_IMPL(terminate_seq_res);
- if(NULL != terminate_seq_res_impl->ns_val)
+ if(terminate_seq_res_impl->ns_val)
{
AXIS2_FREE(env->allocator, terminate_seq_res_impl->ns_val);
terminate_seq_res_impl->ns_val = NULL;
}
terminate_seq_res_impl->identifier = NULL;
- if(NULL != terminate_seq_res_impl->terminate_seq_res.part.ops)
+ if(terminate_seq_res_impl->terminate_seq_res.part.ops)
{
AXIS2_FREE(env->allocator,
terminate_seq_res_impl->terminate_seq_res.part.ops);
@@ -175,49 +175,32 @@
void* AXIS2_CALL
sandesha2_terminate_seq_res_from_om_node(
- sandesha2_iom_rm_element_t *terminate_seq_res,
- const axis2_env_t *env, axiom_node_t *om_node)
+ sandesha2_iom_rm_element_t *terminate_seq_res,
+ const axis2_env_t *env,
+ axiom_node_t *tsr_node)
{
sandesha2_terminate_seq_res_impl_t *terminate_seq_res_impl = NULL;
- axiom_element_t *om_element = NULL;
axiom_element_t *tsr_part = NULL;
- axiom_node_t *tsr_node = NULL;
- axis2_qname_t *tsr_qname = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK(env->error, om_node, NULL);
+ AXIS2_PARAM_CHECK(env->error, tsr_node, NULL);
terminate_seq_res_impl = SANDESHA2_INTF_TO_IMPL(terminate_seq_res);
- om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
- if(NULL == om_element)
- {
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
- AXIS2_FAILURE);
- return NULL;
- }
- tsr_qname = axis2_qname_create(env,
- SANDESHA2_WSRM_COMMON_TERMINATE_SEQ_RESPONSE,
- terminate_seq_res_impl->ns_val, NULL);
- if(NULL == tsr_qname)
- {
- return NULL;
- }
- tsr_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
- tsr_qname, om_node, &tsr_node);
- if(NULL == tsr_part)
+ tsr_part = AXIOM_NODE_GET_DATA_ELEMENT(tsr_node, env);
+ if(!tsr_part)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
terminate_seq_res_impl->identifier = sandesha2_identifier_create(env,
- terminate_seq_res_impl->ns_val);
- if(NULL == terminate_seq_res_impl->identifier)
+ terminate_seq_res_impl->ns_val);
+ if(!terminate_seq_res_impl->identifier)
{
return NULL;
}
- sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)terminate_seq_res_impl->identifier,
- env, tsr_node);
+ sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
+ terminate_seq_res_impl->identifier, env, tsr_node);
return terminate_seq_res;
}
@@ -236,7 +219,7 @@
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
terminate_seq_res_impl = SANDESHA2_INTF_TO_IMPL(terminate_seq_res);
- if(NULL == terminate_seq_res_impl->identifier)
+ if(!terminate_seq_res_impl->identifier)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_OM_NULL_ELEMENT,
AXIS2_FAILURE);
@@ -244,14 +227,14 @@
}
rm_ns = axiom_namespace_create(env, terminate_seq_res_impl->ns_val,
SANDESHA2_WSRM_COMMON_NS_PREFIX_RM);
- if(NULL == rm_ns)
+ if(!rm_ns)
{
return NULL;
}
tsr_element = axiom_element_create(env, NULL,
SANDESHA2_WSRM_COMMON_TERMINATE_SEQ_RESPONSE,
rm_ns, &tsr_node);
- if(NULL == tsr_element)
+ if(!tsr_element)
{
return NULL;
}
@@ -301,7 +284,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
terminate_seq_res_impl = SANDESHA2_INTF_TO_IMPL(terminate_seq_res);
- if(NULL != terminate_seq_res_impl->identifier)
+ if(terminate_seq_res_impl->identifier)
{
/* SANDESHA2_IDENTIFIER_FREE(terminate_seq_res_impl->identifier, env);
terminate_seq_res_impl->identifier = NULL;
@@ -331,7 +314,7 @@
tsr_qname = axis2_qname_create(env,
SANDESHA2_WSRM_COMMON_TERMINATE_SEQ_RESPONSE,
terminate_seq_res_impl->ns_val, NULL);
- if(NULL == tsr_qname)
+ if(!tsr_qname)
{
return AXIS2_FAILURE;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org