Author: damitha
Date: Thu Aug 31 05:23:08 2006
New Revision: 438887
URL: http://svn.apache.org/viewvc?rev=438887&view=rev
Log:
More bug fixes
Modified:
webservices/sandesha/trunk/c/include/sandesha2_ack_range.h
webservices/sandesha/trunk/c/src/util/utils.c
webservices/sandesha/trunk/c/src/wsrm/ack_range.c
webservices/sandesha/trunk/c/src/wsrm/seq_ack.c
Modified: webservices/sandesha/trunk/c/include/sandesha2_ack_range.h
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_ack_range.h?rev=438887&r1=438886&r2=438887&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_ack_range.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_ack_range.h Thu Aug 31
05:23:08 2006
@@ -79,8 +79,9 @@
AXIS2_EXTERN sandesha2_ack_range_t* AXIS2_CALL
sandesha2_ack_range_create(
- const axis2_env_t *env,
- axis2_char_t *ns_value);
+ const axis2_env_t *env,
+ axis2_char_t *ns_value,
+ axis2_char_t *prefix);
/************************** Start of function macros
**************************/
#define SANDESHA2_ACK_RANGE_SET_LOWER_VALUE(ack_range, env, value) \
Modified: webservices/sandesha/trunk/c/src/util/utils.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/utils.c?rev=438887&r1=438886&r2=438887&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/utils.c Thu Aug 31 05:23:08 2006
@@ -984,7 +984,7 @@
sandesha2_ack_range_t *ack_range = NULL;
/* add ack_range (lower, upper) */
- ack_range = sandesha2_ack_range_create(env, rm_ns_value);
+ ack_range = sandesha2_ack_range_create(env, rm_ns_value, NULL);
SANDESHA2_ACK_RANGE_SET_LOWER_VALUE(ack_range, env, lower);
SANDESHA2_ACK_RANGE_SET_UPPER_VALUE(ack_range, env, upper);
AXIS2_ARRAY_LIST_ADD(ack_ranges, env, ack_range);
@@ -997,7 +997,7 @@
{
sandesha2_ack_range_t *ack_range = NULL;
- ack_range = sandesha2_ack_range_create(env, rm_ns_value);
+ ack_range = sandesha2_ack_range_create(env, rm_ns_value, NULL);
SANDESHA2_ACK_RANGE_SET_LOWER_VALUE(ack_range, env, lower);
SANDESHA2_ACK_RANGE_SET_UPPER_VALUE(ack_range, env, upper);
AXIS2_ARRAY_LIST_ADD(ack_ranges, env, ack_range);
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?rev=438887&r1=438886&r2=438887&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_range.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_range.c Thu Aug 31 05:23:08 2006
@@ -16,6 +16,7 @@
#include <sandesha2_ack_range.h>
#include <sandesha2_constants.h>
+#include <axis2_types.h>
#include <stdio.h>
/**
* @brief AckRange struct impl
@@ -29,6 +30,7 @@
long upper_val;
long lower_val;
axis2_char_t *ns_val;
+ axis2_char_t *prefix;
};
#define SANDESHA2_INTF_TO_IMPL(ack_range) \
@@ -74,7 +76,10 @@
/***************************** End of function headers
************************/
AXIS2_EXTERN sandesha2_ack_range_t* AXIS2_CALL
-sandesha2_ack_range_create(const axis2_env_t *env, axis2_char_t *ns_val)
+sandesha2_ack_range_create(
+ const axis2_env_t *env,
+ axis2_char_t *ns_val,
+ axis2_char_t *prefix)
{
sandesha2_ack_range_impl_t *ack_range_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -97,6 +102,7 @@
return NULL;
}
ack_range_impl->ns_val = NULL;
+ ack_range_impl->prefix = NULL;
ack_range_impl->upper_val = 0;
ack_range_impl->lower_val = 0;
ack_range_impl->ack_range.element.ops = NULL;
@@ -123,6 +129,7 @@
}
ack_range_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env);
+ ack_range_impl->prefix = (axis2_char_t *)AXIS2_STRDUP(prefix, env);
ack_range_impl->upper_val = 0;
ack_range_impl->lower_val = 0;
@@ -161,6 +168,13 @@
AXIS2_FREE(env->allocator, ack_range_impl->ns_val);
ack_range_impl->ns_val = NULL;
}
+
+ if(NULL != ack_range_impl->prefix)
+ {
+ AXIS2_FREE(env->allocator, ack_range_impl->prefix);
+ ack_range_impl->prefix = NULL;
+ }
+
ack_range_impl->upper_val = 0;
ack_range_impl->lower_val = 0;
@@ -191,8 +205,10 @@
void* AXIS2_CALL
-sandesha2_ack_range_from_om_node(sandesha2_iom_rm_element_t *ack_range,
- const axis2_env_t *env, axiom_node_t *om_node)
+sandesha2_ack_range_from_om_node(
+ sandesha2_iom_rm_element_t *ack_range,
+ const axis2_env_t *env,
+ axiom_node_t *om_node)
{
sandesha2_ack_range_impl_t *ack_range_impl = NULL;
axis2_qname_t *low_qname = NULL;
@@ -206,13 +222,13 @@
ack_range_impl = SANDESHA2_INTF_TO_IMPL(ack_range);
low_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_LOWER,
- ack_range_impl->ns_val, NULL);
+ ack_range_impl->ns_val, ack_range_impl->prefix);
if(NULL == low_qname)
{
return NULL;
}
upper_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_UPPER,
- ack_range_impl->ns_val, NULL);
+ ack_range_impl->ns_val, ack_range_impl->prefix);
if(NULL == upper_qname)
{
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?rev=438887&r1=438886&r2=438887&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_ack.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_ack.c Thu Aug 31 05:23:08 2006
@@ -292,6 +292,8 @@
axis2_qname_t *ack_range_qname = NULL;
axis2_qname_t *nack_qname = NULL;
axis2_char_t *rm_spec_ver = NULL;
+ axiom_namespace_t *rm_ns = NULL;
+ axis2_char_t *prefix = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
@@ -318,19 +320,18 @@
AXIS2_FAILURE);
return NULL;
}
+ rm_ns = AXIOM_ELEMENT_GET_NAMESPACE(sa_part, env, sa_node);
+ 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)
{
return NULL;
}
- if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(seq_ack_impl->identifier,
- env, sa_node))
- {
- return NULL;
- }
+ SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(seq_ack_impl->identifier,
+ env, sa_node);
ack_range_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_ACK_RANGE,
- seq_ack_impl->ns_val, NULL);
+ seq_ack_impl->ns_val, prefix);
if(NULL == ack_range_qname)
{
return NULL;
@@ -349,7 +350,7 @@
ack_node = AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(ack_iter, env);
if(NULL != ack_node)
{
- ack_range = sandesha2_ack_range_create(env, seq_ack_impl->ns_val);
+ ack_range = sandesha2_ack_range_create(env, seq_ack_impl->ns_val,
prefix);
if(NULL == ack_range)
{
return NULL;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
