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/11/06 09:43:41 UTC
svn commit: r471668 - in /webservices/sandesha/trunk/c:
samples/RMSampleService/ src/msgprocessors/ src/workers/ src/wsrm/
Author: damitha
Date: Mon Nov 6 00:43:40 2006
New Revision: 471668
URL: http://svn.apache.org/viewvc?view=rev&rev=471668
Log:
Now interop with sandesha2 java. Removed the earlier samples
and added new samples that I used to interoperate.
Modified:
webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c
webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.h
webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
webservices/sandesha/trunk/c/src/wsrm/ack_range.c
webservices/sandesha/trunk/c/src/wsrm/seq_ack.c
Modified: webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c?view=diff&rev=471668&r1=471667&r2=471668
==============================================================================
--- webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c (original)
+++ webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c Mon Nov 6 00:43:40 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "rm_svc_interop.h"
+#include "rm_sample_svc.h"
#include <axiom_xml_writer.h>
#include <stdio.h>
#include <axis2_qname.h>
@@ -24,7 +24,7 @@
axis2_char_t *text);
axiom_node_t *
-rm_svc_interop_echo (
+rm_sample_svc_echo (
const axis2_env_t *env,
axiom_node_t *node)
{
@@ -133,7 +133,7 @@
}
void
-rm_svc_interop_ping (
+rm_sample_svc_ping (
const axis2_env_t *env,
axiom_node_t *node)
{
Modified: webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.h?view=diff&rev=471668&r1=471667&r2=471668
==============================================================================
--- webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.h (original)
+++ webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.h Mon Nov 6 00:43:40 2006
@@ -25,12 +25,12 @@
#include <axiom_element.h>
axiom_node_t *
-rm_svc_interop_echo(
+rm_sample_svc_echo(
const axis2_env_t *env,
axiom_node_t *node);
void
-rm_svc_interop_ping (
+rm_sample_svc_ping (
const axis2_env_t *env,
axiom_node_t *node);
Modified: webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c?view=diff&rev=471668&r1=471667&r2=471668
==============================================================================
--- webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c (original)
+++ webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c Mon Nov 6 00:43:40 2006
@@ -14,39 +14,39 @@
* limitations under the License.
*/
#include <axis2_svc_skeleton.h>
-#include "rm_svc_interop.h"
+#include "rm_sample_svc.h"
#include <axis2_array_list.h>
#include <axis2_op.h>
int AXIS2_CALL
-rm_svc_interop_free(axis2_svc_skeleton_t *svc_skeleton,
+rm_sample_svc_free(axis2_svc_skeleton_t *svc_skeleton,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-rm_svc_interop_free_void_arg(void *svc_skeleton,
+rm_sample_svc_free_void_arg(void *svc_skeleton,
const axis2_env_t *env);
/*
* This method invokes the right service method
*/
axiom_node_t* AXIS2_CALL
-rm_svc_interop_invoke(axis2_svc_skeleton_t *svc_skeleton,
+rm_sample_svc_invoke(axis2_svc_skeleton_t *svc_skeleton,
const axis2_env_t *env,
axiom_node_t *node,
axis2_msg_ctx_t *msg_ctx);
int AXIS2_CALL
-rm_svc_interop_init(axis2_svc_skeleton_t *svc_skeleton,
+rm_sample_svc_init(axis2_svc_skeleton_t *svc_skeleton,
const axis2_env_t *env);
axiom_node_t* AXIS2_CALL
-rm_svc_interop_on_fault(axis2_svc_skeleton_t *svc_skeli,
+rm_sample_svc_on_fault(axis2_svc_skeleton_t *svc_skeli,
const axis2_env_t *env, axiom_node_t *node);
/*Create function */
axis2_svc_skeleton_t *
-rm_svc_interop_create(const axis2_env_t *env)
+rm_sample_svc_create(const axis2_env_t *env)
{
axis2_svc_skeleton_t *svc_skeleton = NULL;
/* Allocate memory for the structs */
@@ -58,17 +58,17 @@
svc_skeleton->func_array = NULL;
/* Assign function pointers */
- svc_skeleton->ops->free = rm_svc_interop_free;
- svc_skeleton->ops->init = rm_svc_interop_init;
- svc_skeleton->ops->invoke = rm_svc_interop_invoke;
- svc_skeleton->ops->on_fault = rm_svc_interop_on_fault;
+ svc_skeleton->ops->free = rm_sample_svc_free;
+ svc_skeleton->ops->init = rm_sample_svc_init;
+ svc_skeleton->ops->invoke = rm_sample_svc_invoke;
+ svc_skeleton->ops->on_fault = rm_sample_svc_on_fault;
return svc_skeleton;
}
/* Initialize the service */
int AXIS2_CALL
-rm_svc_interop_init(
+rm_sample_svc_init(
axis2_svc_skeleton_t *svc_skeleton,
const axis2_env_t *env)
{
@@ -86,7 +86,7 @@
* This method invokes the right service method
*/
axiom_node_t* AXIS2_CALL
-rm_svc_interop_invoke(
+rm_sample_svc_invoke(
axis2_svc_skeleton_t *svc_skeleton,
const axis2_env_t *env,
axiom_node_t *node,
@@ -105,10 +105,10 @@
if(op_name)
{
if (AXIS2_STRCMP(op_name, "echoString") == 0)
- return rm_svc_interop_echo(env, node);
+ return rm_sample_svc_echo(env, node);
if (AXIS2_STRCMP(op_name, "ping") == 0)
{
- rm_svc_interop_ping(env, node);
+ rm_sample_svc_ping(env, node);
return NULL;
}
}
@@ -118,7 +118,7 @@
/* On fault, handle the fault */
axiom_node_t* AXIS2_CALL
-rm_svc_interop_on_fault(axis2_svc_skeleton_t *svc_skeli,
+rm_sample_svc_on_fault(axis2_svc_skeleton_t *svc_skeli,
const axis2_env_t *env, axiom_node_t *node)
{
/* Here we are just setting a simple error message inside an element
@@ -136,7 +136,7 @@
/* Free the resources used */
int AXIS2_CALL
-rm_svc_interop_free(axis2_svc_skeleton_t *svc_skeleton,
+rm_sample_svc_free(axis2_svc_skeleton_t *svc_skeleton,
const axis2_env_t *env)
{
/* Free the function array */
@@ -171,7 +171,7 @@
axis2_get_instance(axis2_svc_skeleton_t **inst,
const axis2_env_t *env)
{
- *inst = rm_svc_interop_create(env);
+ *inst = rm_sample_svc_create(env);
if(!(*inst))
{
return AXIS2_FAILURE;
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c?view=diff&rev=471668&r1=471667&r2=471668
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c Mon Nov 6 00:43:40 2006
@@ -362,6 +362,7 @@
SANDESHA2_MSG_CTX_SET_PAUSED(rm_msg_ctx, env, AXIS2_TRUE);
AXIS2_LOG_INFO(env->log,
"[sandesha2] Exit: sandesha2_ack_msg_processor_process_in_msg");
+ printf("[sandesha2] Exit: sandesha2_ack_msg_processor_process_in_msg\n");
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?view=diff&rev=471668&r1=471667&r2=471668
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Mon Nov 6 00:43:40 2006
@@ -206,7 +206,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
AXIS2_LOG_INFO(env->log,
- "[sandesha2] sandesha2_app_msg_processor_process_in_msg .........*******************");
+ "[sandesha2] sandesha2_app_msg_processor_process_in_msg .........");
printf("sandesha2_app_msg_processor_process_in_msg\n");
seq_ack = (sandesha2_seq_ack_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx,
@@ -270,8 +270,6 @@
fault_mgr, env, rm_msg_ctx, storage_mgr);
if(fault_ctx)
{
- AXIS2_LOG_INFO(env->log,
- "[sandesha2] came3 .........");
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
if(AXIS2_FAILURE == AXIS2_ENGINE_SEND_FAULT(engine, env,
SANDESHA2_MSG_CTX_GET_MSG_CTX(fault_ctx, env)))
@@ -295,7 +293,6 @@
rm_msg_ctx, str_seq_id, storage_mgr);
if(fault_ctx)
{
- AXIS2_LOG_INFO(env->log, "[sandesha2] came4 .........");
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
if(AXIS2_FAILURE == AXIS2_ENGINE_SEND_FAULT(engine, env,
SANDESHA2_MSG_CTX_GET_MSG_CTX(fault_ctx, env)))
@@ -308,15 +305,11 @@
return AXIS2_SUCCESS;
}
SANDESHA2_SEQ_SET_MUST_UNDERSTAND(seq, env, AXIS2_FALSE);
- AXIS2_LOG_INFO(env->log,
- "[sandesha2] came5 .........");
SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env);
fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_SEQ_CLOSED(fault_mgr, env,
rm_msg_ctx, str_seq_id, storage_mgr);
if(fault_ctx)
{
- AXIS2_LOG_INFO(env->log,
- "[sandesha2] came6 .........");
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
if(AXIS2_FAILURE == AXIS2_ENGINE_SEND_FAULT(engine, env,
SANDESHA2_MSG_CTX_GET_MSG_CTX(fault_ctx, env)))
@@ -622,7 +615,7 @@
to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
SANDESHA2_CLIENT_SEQ_KEY, AXIS2_FALSE);
- if(NULL != property)
+ if(property)
seq_key = AXIS2_PROPERTY_GET_VALUE(property, env);
internal_seq_id = sandesha2_utils_get_internal_seq_id(env,
to, seq_key);
@@ -667,12 +660,12 @@
*/
property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
SANDESHA2_CLIENT_DUMMY_MESSAGE, AXIS2_FALSE);
- if(NULL != property)
+ if(property)
dummy_msg_str = AXIS2_PROPERTY_GET_VALUE(property, env);
- if(NULL != dummy_msg_str && 0 == AXIS2_STRCMP(dummy_msg_str,
+ if(dummy_msg_str && 0 == AXIS2_STRCMP(dummy_msg_str,
SANDESHA2_VALUE_TRUE))
dummy_msg = AXIS2_TRUE;
- if(AXIS2_FALSE == dummy_msg)
+ if(!dummy_msg)
sandesha2_app_msg_processor_set_next_msg_no(env, internal_seq_id,
msg_number, storage_mgr);
@@ -683,7 +676,7 @@
msg_number_str);
SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
res_highest_msg_bean);
- if(AXIS2_TRUE == last_msg)
+ if(last_msg)
{
sandesha2_seq_property_bean_t *res_highest_msg_key_bean = NULL;
sandesha2_seq_property_bean_t *res_last_msg_key_bean = NULL;
@@ -703,7 +696,7 @@
}
out_seq_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
- if(AXIS2_TRUE == is_svr_side)
+ if(is_svr_side)
{
axis2_char_t *incoming_seq_id = NULL;
sandesha2_seq_property_bean_t *incoming_to_bean = NULL;
@@ -814,13 +807,13 @@
reply_to_epr_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(
seq_prop_mgr, env, incoming_seq_id,
SANDESHA2_SEQ_PROP_REPLY_TO_EPR);
- if(NULL != reply_to_epr_bean)
+ if(reply_to_epr_bean)
{
axis2_endpoint_ref_t *acks_epr = NULL;
acks_epr = axis2_endpoint_ref_create(env,
SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(reply_to_epr_bean,
env));
- if(NULL != acks_epr)
+ if(acks_epr)
acks_to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
acks_epr, env);
}
@@ -834,17 +827,17 @@
}
}
soap_env = SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(rm_msg_ctx, env);
- if(NULL == soap_env)
+ if(!soap_env)
{
soap_env = axiom_soap_envelope_create_default_soap_envelope(env,
AXIOM_SOAP12);
SANDESHA2_MSG_CTX_SET_SOAP_ENVELOPE(rm_msg_ctx, env, soap_env);
}
msg_id = axis2_uuid_gen(env);
- if(NULL == SANDESHA2_MSG_CTX_GET_MSG_ID(rm_msg_ctx, env))
+ if(!SANDESHA2_MSG_CTX_GET_MSG_ID(rm_msg_ctx, env))
SANDESHA2_MSG_CTX_SET_MSG_ID(rm_msg_ctx, env, msg_id);
- if(AXIS2_TRUE == is_svr_side)
+ if(is_svr_side)
{
/* let the request end with 202 if a ack has not been
* written in the incoming thread
@@ -855,15 +848,15 @@
ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_ACK_WRITTEN,
AXIS2_FALSE);
- if(NULL != property)
+ if(property)
written = AXIS2_PROPERTY_GET_VALUE(property, env);
- if(NULL == written || 0 != AXIS2_STRCMP(written, SANDESHA2_VALUE_TRUE))
+ if(!written || 0 != AXIS2_STRCMP(written, SANDESHA2_VALUE_TRUE))
{
axis2_ctx_t *ctx = NULL;
- if (NULL != op_ctx)
+ if (op_ctx)
{
ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
- if (NULL != ctx)
+ if (ctx)
{
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
@@ -879,14 +872,20 @@
AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env), env), env),
env);
to_addr = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
- if(NULL == AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env))
+ /* test code */
+ /*if(!AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env))
AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, axis2_strcat(env, to_addr,
- "/", op_name, NULL));
- if(NULL == AXIS2_MSG_CTX_GET_SOAP_ACTION(msg_ctx, env))
+ "/", op_name, NULL));*/
+ if(!AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env))
+ AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, to_addr);
+ printf("to_addr:%s#############################\n", to_addr);
+ /*if(!AXIS2_MSG_CTX_GET_SOAP_ACTION(msg_ctx, env))
AXIS2_MSG_CTX_SET_SOAP_ACTION(msg_ctx, env, axis2_strcat(env, "\"",
- to_addr, "/", op_name, "\"", NULL));
+ to_addr, "/", op_name, "\"", NULL));*/
+ if(!AXIS2_MSG_CTX_GET_SOAP_ACTION(msg_ctx, env))
+ AXIS2_MSG_CTX_SET_SOAP_ACTION(msg_ctx, env, to_addr);
- if(AXIS2_FALSE == dummy_msg)
+ if(!dummy_msg)
sandesha2_app_msg_processor_process_response_msg(env, rm_msg_ctx,
internal_seq_id, msg_number, storage_key, storage_mgr);
AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c?view=diff&rev=471668&r1=471667&r2=471668
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Mon Nov 6 00:43:40 2006
@@ -214,7 +214,7 @@
fault_mgr = sandesha2_fault_mgr_create(env);
fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_UNKNOWN_SEQ(fault_mgr, env,
rm_msg_ctx, seq_id, storage_man);
- if(NULL != fault_ctx)
+ if(fault_ctx)
{
axis2_engine_t *engine = NULL;
engine = axis2_engine_create(env, conf_ctx);
@@ -250,6 +250,7 @@
SANDESHA2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
AXIS2_LOG_INFO(env->log,
"[sandesha2] Exit: sandesha2_terminate_msg_processor_process_in_msg");
+ printf("[sandesha2] Exit: sandesha2_terminate_msg_processor_process_in_msg\n");
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/in_order_invoker.c?view=diff&rev=471668&r1=471667&r2=471668
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Mon Nov 6 00:43:40 2006
@@ -275,13 +275,11 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
- AXIS2_LOG_INFO(env->log, "came10*************************");
args = AXIS2_MALLOC(env->allocator, sizeof(
sandesha2_in_order_invoker_args_t));
args->impl = invoker_impl;
args->env = (axis2_env_t*)env;
- AXIS2_LOG_INFO(env->log, "came11*************************");
worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
sandesha2_in_order_invoker_worker_func, (void*)args);
if(NULL == worker_thread)
@@ -352,7 +350,6 @@
int i = 0;
AXIS2_SLEEP(1);
- AXIS2_LOG_INFO(env->log, "came20*************************");
storage_mgr = sandesha2_utils_get_storage_mgr(env,
invoker_impl->conf_ctx,
AXIS2_CONF_CTX_GET_CONF(invoker_impl->conf_ctx, env));
@@ -376,7 +373,6 @@
for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(all_seq_list, env); i++)
{
- AXIS2_LOG_INFO(env->log, "came21*************************");
axis2_char_t *seq_id = NULL;
long next_msg_no = -1;
sandesha2_next_msg_bean_t *next_msg_bean = NULL;
Modified: webservices/sandesha/trunk/c/src/wsrm/ack_range.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_range.c?view=diff&rev=471668&r1=471667&r2=471668
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_range.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_range.c Mon Nov 6 00:43:40 2006
@@ -223,28 +223,33 @@
ack_range_impl = SANDESHA2_INTF_TO_IMPL(ack_range);
low_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_LOWER,
ack_range_impl->ns_val, ack_range_impl->prefix);
- if(NULL == low_qname)
+ if(!low_qname)
{
return NULL;
}
upper_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_UPPER,
ack_range_impl->ns_val, ack_range_impl->prefix);
- if(NULL == upper_qname)
+ if(!upper_qname)
{
return NULL;
}
om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
- if(NULL == om_element)
+ if(!om_element)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
AXIS2_FAILURE);
return NULL;
}
- lower_str = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE(om_element, env,
+ /*lower_str = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE(om_element, env,
low_qname);
upper_str = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE(om_element, env,
- upper_qname);
- if(NULL == lower_str || NULL == upper_str)
+ upper_qname);*/
+ lower_str = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(om_element, env,
+ SANDESHA2_WSRM_COMMON_LOWER);
+ upper_str = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(om_element, env,
+ SANDESHA2_WSRM_COMMON_UPPER);
+
+ if(!lower_str || !upper_str)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ATTRIBUTE,
AXIS2_FAILURE);
@@ -258,8 +263,10 @@
axiom_node_t* AXIS2_CALL
-sandesha2_ack_range_to_om_node(sandesha2_iom_rm_element_t *ack_range,
- const axis2_env_t *env, void *om_node)
+sandesha2_ack_range_to_om_node(
+ sandesha2_iom_rm_element_t *ack_range,
+ const axis2_env_t *env,
+ void *om_node)
{
sandesha2_ack_range_impl_t *ack_range_impl = NULL;
axiom_namespace_t *rm_ns = NULL;
@@ -285,14 +292,18 @@
{
return NULL;
}
+ /*lower_attr = axiom_attribute_create(env, SANDESHA2_WSRM_COMMON_LOWER,
+ lower_str, rm_ns);*/
lower_attr = axiom_attribute_create(env, SANDESHA2_WSRM_COMMON_LOWER,
- lower_str, rm_ns);
+ lower_str, NULL);
if(NULL == lower_attr)
{
return NULL;
}
+ /*upper_attr = axiom_attribute_create(env, SANDESHA2_WSRM_COMMON_UPPER,
+ upper_str, rm_ns);*/
upper_attr = axiom_attribute_create(env, SANDESHA2_WSRM_COMMON_UPPER,
- upper_str, rm_ns);
+ upper_str, NULL);
if(NULL == upper_attr)
{
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=471668&r1=471667&r2=471668
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_ack.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_ack.c Mon Nov 6 00:43:40 2006
@@ -300,7 +300,7 @@
seq_ack_impl = SANDESHA2_INTF_TO_IMPL(seq_ack);
om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
- if(NULL == om_element)
+ if(!om_element)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
AXIS2_FAILURE);
@@ -308,13 +308,13 @@
}
sa_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ_ACK,
seq_ack_impl->ns_val, NULL);
- if(NULL == sa_qname)
+ if(!sa_qname)
{
return NULL;
}
sa_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
sa_qname, om_node, &sa_node);
- if(NULL == sa_part)
+ if(!sa_part)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_OM_ELEMENT,
AXIS2_FAILURE);
@@ -324,7 +324,7 @@
prefix = AXIOM_NAMESPACE_GET_PREFIX(rm_ns, env);
seq_ack_impl->identifier = sandesha2_identifier_create(env,
seq_ack_impl->ns_val);
- if(NULL == seq_ack_impl->identifier)
+ if(!seq_ack_impl->identifier)
{
return NULL;
}
@@ -332,46 +332,46 @@
env, sa_node);
ack_range_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_ACK_RANGE,
seq_ack_impl->ns_val, prefix);
- if(NULL == ack_range_qname)
+ if(!ack_range_qname)
{
return NULL;
}
ack_iter = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(sa_part, env,
ack_range_qname, sa_node);
- if(NULL == ack_iter)
+ if(!ack_iter)
{
return NULL;
}
- while(AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(ack_iter,
+ 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(NULL != ack_node)
+ if(ack_node)
{
ack_range = sandesha2_ack_range_create(env, seq_ack_impl->ns_val, prefix);
- if(NULL == ack_range)
+ if(!ack_range)
{
return NULL;
}
- SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(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(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);
- if(NULL == nack_qname)
+ if(!nack_qname)
{
return NULL;
}
nack_iter = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(sa_part, env,
nack_qname, sa_node);
- if(NULL == nack_iter)
+ if(!nack_iter)
{
return NULL;
}
- while(AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(nack_iter,
+ while(AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(nack_iter,
env))
{
axiom_node_t *nack_node = NULL;
@@ -380,7 +380,7 @@
if(NULL != nack_iter)
{
nack = sandesha2_nack_create(env, seq_ack_impl->ns_val);
- if(NULL == nack)
+ if(!nack)
{
return NULL;
}
@@ -390,7 +390,7 @@
}
rm_spec_ver = sandesha2_spec_specific_consts_get_spec_ver_str(env,
seq_ack_impl->ns_val);
- if(AXIS2_TRUE == sandesha2_spec_specific_consts_is_ack_final_allowed(env,
+ if(sandesha2_spec_specific_consts_is_ack_final_allowed(env,
rm_spec_ver))
{
axiom_element_t *af_part = NULL;
@@ -399,17 +399,17 @@
af_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_FINAL,
seq_ack_impl->ns_val, NULL);
- if(NULL == af_qname)
+ if(!af_qname)
{
return NULL;
}
af_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(sa_part, env,
af_qname, sa_node, &af_node);
- if(NULL != af_part)
+ if(af_part)
{
seq_ack_impl->ack_final = sandesha2_ack_final_create(env,
seq_ack_impl->ns_val);
- if(NULL == seq_ack_impl->ack_final)
+ if(!seq_ack_impl->ack_final)
{
return NULL;
}
@@ -417,7 +417,7 @@
sa_node);
}
}
- if(AXIS2_TRUE == sandesha2_spec_specific_consts_is_ack_none_allowed(env,
+ if(sandesha2_spec_specific_consts_is_ack_none_allowed(env,
rm_spec_ver))
{
axiom_element_t *an_part = NULL;
@@ -428,15 +428,15 @@
seq_ack_impl->ns_val, NULL);
an_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(sa_part, env,
an_qname, sa_node, &an_node);
- if(NULL != an_part)
+ if(an_part)
{
- if(NULL == an_qname)
+ if(!an_qname)
{
return NULL;
}
seq_ack_impl->ack_none = sandesha2_ack_none_create(env,
seq_ack_impl->ns_val);
- if(NULL == seq_ack_impl->ack_none)
+ if(!seq_ack_impl->ack_none)
{
return NULL;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org