Author: damitha
Date: Tue Jan 23 01:48:16 2007
New Revision: 498969
URL: http://svn.apache.org/viewvc?view=rev&rev=498969
Log:
Updated samples
Added:
webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c
- copied, changed from r498938,
webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_client.c
Removed:
webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_client.c
Modified:
webservices/sandesha/trunk/c/samples/rm_echo_single/rm_echo_single.c
webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c
webservices/sandesha/trunk/c/src/client/client.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
Modified: webservices/sandesha/trunk/c/samples/rm_echo_single/rm_echo_single.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_single/rm_echo_single.c?view=diff&rev=498969&r1=498968&r2=498969
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_single/rm_echo_single.c
(original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_single/rm_echo_single.c Tue
Jan 23 01:48:16 2007
@@ -66,6 +66,7 @@
axis2_listener_manager_t *listener_manager = NULL;
axis2_char_t *offered_seq_id = NULL;
axis2_status_t status = AXIS2_FAILURE;
+ int c;
/* Set up the environment */
/*env = axis2_env_create_all("echo_non_blocking_dual.log",
@@ -78,6 +79,25 @@
/* Set end point reference of echo service */
/*address = "http://127.0.0.1:8888/axis2/services/RMSampleService";*/
address = "http://127.0.0.1:5555/axis2/services/RMSampleService";;
+ while ((c = AXIS2_GETOPT(argc, argv, ":a:")) != -1)
+ {
+
+ switch (c)
+ {
+ case 'a':
+ address = optarg;
+ break;
+ case ':':
+ fprintf(stderr, "\nOption -%c requires an operand\n", optopt);
+ usage(argv[0]);
+ return -1;
+ case '?':
+ if (isprint(optopt))
+ fprintf(stderr, "\nUnknown option `-%c'.\n", optopt);
+ usage(argv[0]);
+ return -1;
+ }
+ }
if (AXIS2_STRCMP(address, "-h") == 0)
{
printf("Usage : %s [endpoint_url] [offer]\n", argv[0]);
@@ -278,13 +298,7 @@
{
fprintf(stdout, "\n Usage : %s", prog_name);
fprintf(stdout, " [-a ADDRESS]");
- fprintf(stdout, " [-o OFFER]");
- fprintf(stdout, " [-m SINGLE CHANNEL]");
fprintf(stdout, " Options :\n");
- fprintf(stdout, "\t-m SINGLE CHANNEL \t single channel.. Type 0 for not to
use single channel. The" \
- " default behaviour is single channel(1) \n");
- fprintf(stdout, "\t-o OFFER \t seq offer value.. Type 1 for sequence
offer" \
- "feature. The default behaviour is no offer(0). \n");
fprintf(stdout, "\t-a ADDRESS \t endpoint address.. The" \
" default is http://127.0.0.1:5555/axis2/services/RMSampleService \n");
fprintf(stdout, " Help :\n\t-h \t display this help screen.\n\n");
Copied: webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c (from
r498938, webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_client.c)
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c?view=diff&rev=498969&p1=webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_client.c&r1=498938&p2=webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c&r2=498969
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_client.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c Tue Jan 23
01:48:16 2007
@@ -47,7 +47,6 @@
axis2_status_t status = AXIS2_FAILURE;
axis2_property_t *property = NULL;
int count = 0;
- int version = 1;
int c;
/* Set up the environment */
@@ -59,7 +58,7 @@
/*address = "http://127.0.0.1:5555/axis2/services/RMSampleService";*/
/*to = "http://127.0.0.1:8080/axis2/services/RMSampleService";*/
to = "http://127.0.0.1:5555/axis2/services/RMSampleService";;
- while ((c = AXIS2_GETOPT(argc, argv, ":a:v:")) != -1)
+ while ((c = AXIS2_GETOPT(argc, argv, ":a:")) != -1)
{
switch (c)
@@ -67,9 +66,6 @@
case 'a':
address = optarg;
break;
- case 'v': /* RM Version */
- version = AXIS2_ATOI(optarg);
- break;
case ':':
fprintf(stderr, "\nOption -%c requires an operand\n", optopt);
usage(argv[0]);
@@ -131,16 +127,13 @@
/* Build the SOAP request message payload using OM API.*/
AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, "sandesha2");
- /* RM Version 1.1 */
- if(version == 1)
+ /* RM Version 1.0 */
+ property = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_SPEC_VERSION_1_0);
+ if(property)
{
- property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_SPEC_VERSION_1_1);
- if(property)
- {
- AXIS2_OPTIONS_SET_PROPERTY(options, env,
- SANDESHA2_CLIENT_RM_SPEC_VERSION, property);
- }
+ AXIS2_OPTIONS_SET_PROPERTY(options, env,
+ SANDESHA2_CLIENT_RM_SPEC_VERSION, property);
}
/* Send request */
payload = build_om_programatically(env, "ping1");
@@ -163,13 +156,10 @@
if(status)
printf("\nping client invoke SUCCESSFUL!\n");
- sandesha2_client_terminate_seq_with_svc_client_and_seq_key(env,
svc_client,
- "sequence1");
/** Wait till callback is complete. Simply keep the parent thread running
until our on_complete or on_error is invoked */
- /*AXIS2_SLEEP(MAX_COUNT);*/
- AXIS2_SLEEP(120);
+ AXIS2_SLEEP(MAX_COUNT);
if (svc_client)
{
@@ -209,10 +199,7 @@
{
fprintf(stdout, "\n Usage : %s", prog_name);
fprintf(stdout, " [-a ADDRESS]");
- fprintf(stdout, " [-v RM VERSION]");
fprintf(stdout, " Options :\n");
- fprintf(stdout, "\t-v RM VERSION \t rm version.. Type 0 for version 1.0, "
\
- "1 for version 1.1. The default rm version is 1.1 \n");
fprintf(stdout, "\t-a ADDRESS \t endpoint address.. The"
" default is http://127.0.0.1:5555/axis2/services/RMSampleService
../\n");
fprintf(stdout, " Help :\n\t-h \t display this help screen.\n\n");
Modified: webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c?view=diff&rev=498969&r1=498968&r2=498969
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c Tue Jan 23
01:48:16 2007
@@ -23,7 +23,7 @@
#include <sandesha2_constants.h>
#include <sandesha2_client.h>
-#define MAX_COUNT 60
+#define MAX_COUNT 8
axiom_node_t *
build_om_programatically(
@@ -40,6 +40,7 @@
const axis2_env_t *env = NULL;
const axis2_char_t *address = NULL;
const axis2_char_t *to = NULL;
+ const axis2_char_t *seq_key = NULL;
axis2_endpoint_ref_t* endpoint_ref = NULL;
axis2_endpoint_ref_t* target_epr = NULL;
axis2_options_t *options = NULL;
@@ -49,7 +50,6 @@
axis2_status_t status = AXIS2_FAILURE;
axis2_property_t *property = NULL;
int count = 0;
- int version = 1;
int c;
/* Set up the environment */
@@ -61,7 +61,7 @@
/*address = "http://127.0.0.1:5555/axis2/services/RMSampleService";*/
/*to = "http://127.0.0.1:8080/axis2/services/RMSampleService";*/
to = "http://127.0.0.1:5555/axis2/services/RMSampleService";;
- while ((c = AXIS2_GETOPT(argc, argv, ":a:v:")) != -1)
+ while ((c = AXIS2_GETOPT(argc, argv, ":a:k:")) != -1)
{
switch (c)
@@ -69,8 +69,8 @@
case 'a':
address = optarg;
break;
- case 'v': /* RM Version */
- version = AXIS2_ATOI(optarg);
+ case 'k': /* Sequenc Key */
+ seq_key = optarg;
break;
case ':':
fprintf(stderr, "\nOption -%c requires an operand\n", optopt);
@@ -121,8 +121,8 @@
{
printf("Error creating service client\n");
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Stub invoke FAILED: Error
code:"
- " %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ " %d :: %s", env->error->error_number,
+ AXIS2_ERROR_GET_MESSAGE(env->error));
}
/* Set service client options */
@@ -134,52 +134,48 @@
/* Build the SOAP request message payload using OM API.*/
AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, env, "sandesha2");
/* RM Version 1.1 */
- if(version == 1)
+ property = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_SPEC_VERSION_1_1);
+ if(property)
+ {
+ AXIS2_OPTIONS_SET_PROPERTY(options, env,
+ SANDESHA2_CLIENT_RM_SPEC_VERSION, property);
+ }
+ if(seq_key)
{
- property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_SPEC_VERSION_1_1);
+ property = axis2_property_create_with_args(env, 3, 0, 0, seq_key);
if(property)
{
- AXIS2_OPTIONS_SET_PROPERTY(options, env,
- SANDESHA2_CLIENT_RM_SPEC_VERSION, property);
+ AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_SEQ_KEY,
+ property);
}
}
- property = axis2_property_create_with_args(env, 3, 0, 0, "sequence1");
- if(property)
- {
- AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_SEQ_KEY,
- property);
- }
/* Send request */
- payload = build_om_programatically(env, "ping1", "seqeuence1");
+ payload = build_om_programatically(env, "ping1", seq_key);
status = AXIS2_SVC_CLIENT_SEND_ROBUST(svc_client, env, payload);
if(status)
printf("\nping client invoke SUCCESSFUL!\n");
payload = NULL;
AXIS2_SLEEP(MAX_COUNT);
- /*payload = build_om_programatically(env, "ping2");
+ payload = build_om_programatically(env, "ping2", seq_key);
status = AXIS2_SVC_CLIENT_SEND_ROBUST(svc_client, env, payload);
if(status)
printf("\nping client invoke SUCCESSFUL!\n");
payload = NULL;
AXIS2_SLEEP(MAX_COUNT);
- property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
- AXIS2_OPTIONS_SET_PROPERTY(options, env, "Sandesha2LastMessage",
- property);
- payload = build_om_programatically(env, "ping3");
+ payload = build_om_programatically(env, "ping3", seq_key);
status = AXIS2_SVC_CLIENT_SEND_ROBUST(svc_client, env, payload);
if(status)
printf("\nping client invoke SUCCESSFUL!\n");
- AXIS2_SLEEP(MAX_COUNT);*/
+ AXIS2_SLEEP(2 * MAX_COUNT);
sandesha2_client_terminate_seq_with_svc_client(env, svc_client, NULL,
NULL);
/** Wait till callback is complete. Simply keep the parent thread running
until our on_complete or on_error is invoked */
- /*AXIS2_SLEEP(MAX_COUNT);*/
- AXIS2_SLEEP(120);
+ AXIS2_SLEEP(MAX_COUNT);
if (svc_client)
{
@@ -194,7 +190,7 @@
build_om_programatically(
const axis2_env_t *env,
axis2_char_t *text,
- axis2_char_t *seq)
+ axis2_char_t *seq_key)
{
axiom_node_t *ping_om_node = NULL;
axiom_element_t* ping_om_ele = NULL;
@@ -208,9 +204,11 @@
ns1 = axiom_namespace_create (env, "http://tempuri.org/";, "ns1");
ping_om_ele = axiom_element_create(env, NULL, "ping", ns1, &ping_om_node);
text_om_ele = axiom_element_create(env, ping_om_node, "Text", ns1,
&text_om_node);
- seq_om_ele = axiom_element_create(env, ping_om_node, "Sequence", ns1,
&seq_om_node);
+ if(seq_key)
+ seq_om_ele = axiom_element_create(env, ping_om_node, "Sequence", ns1,
&seq_om_node);
AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, text, text_om_node);
- AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, seq, seq_om_node);
+ if(seq_key)
+ AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, seq_key, seq_om_node);
buffer = AXIOM_NODE_TO_STRING(ping_om_node, env);
printf("\nSending OM node in XML : %s \n", buffer);
@@ -224,10 +222,9 @@
{
fprintf(stdout, "\n Usage : %s", prog_name);
fprintf(stdout, " [-a ADDRESS]");
- fprintf(stdout, " [-v RM VERSION]");
+ fprintf(stdout, " [-k PROVIDE SEQUENCE KEY]");
fprintf(stdout, " Options :\n");
- fprintf(stdout, "\t-v RM VERSION \t rm version.. Type 0 for version 1.0, "
\
- "1 for version 1.1. The default rm version is 1.1 \n");
+ fprintf(stdout, "\t-k PROVIDE SEQUENCE KEY \t provide the sequence key as
string \n");
fprintf(stdout, "\t-a ADDRESS \t endpoint address.. The"
" default is http://127.0.0.1:5555/axis2/services/RMSampleService
../\n");
fprintf(stdout, " Help :\n\t-h \t display this help screen.\n\n");
Modified: webservices/sandesha/trunk/c/src/client/client.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/client.c?view=diff&rev=498969&r1=498968&r2=498969
==============================================================================
--- webservices/sandesha/trunk/c/src/client/client.c (original)
+++ webservices/sandesha/trunk/c/src/client/client.c Tue Jan 23 01:48:16 2007
@@ -262,10 +262,8 @@
}
if(!within_transaction)
{
- axis2_allocator_switch_to_global_pool(env->allocator);
report_transaction =
sandesha2_storage_mgr_get_transaction(storage_mgr,
env);
- axis2_allocator_switch_to_local_pool(env->allocator);
}
SANDESHA2_SEQ_REPORT_SET_INTERNAL_SEQ_ID(seq_report, env, internal_seq_id);
create_seq_find_bean = sandesha2_create_seq_bean_create(env);
@@ -421,9 +419,7 @@
}
if(AXIS2_TRUE != within_transaction)
{
- axis2_allocator_switch_to_global_pool(env->allocator);
report_transaction =
sandesha2_storage_mgr_get_transaction(storage_mgr, env);
- axis2_allocator_switch_to_local_pool(env->allocator);
}
if(internal_seq_find_bean)
sandesha2_seq_property_bean_set_name(internal_seq_find_bean, env,
@@ -1595,10 +1591,8 @@
}
if(!within_transaction)
{
- axis2_allocator_switch_to_global_pool(env->allocator);
report_transaction =
sandesha2_storage_mgr_get_transaction(storage_mgr,
env);
- axis2_allocator_switch_to_local_pool(env->allocator);
}
seq_report = sandesha2_seq_report_create(env);
completed_msg_list = sandesha2_ack_mgr_get_svr_completed_msgs_list(env,
@@ -1697,10 +1691,8 @@
{
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
storage_mgr, env);
- axis2_allocator_switch_to_global_pool(env->allocator);
transaction = sandesha2_storage_mgr_get_transaction(storage_mgr,
env);
- axis2_allocator_switch_to_local_pool(env->allocator);
}
if(seq_prop_mgr)
seq_id_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr,
env,
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=498969&r1=498968&r2=498969
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Tue Jan
23 01:48:16 2007
@@ -366,7 +366,6 @@
else
{
msgs_bean = sandesha2_seq_property_bean_create(env);
- printf("str_seq_id:%s\n", str_seq_id);
sandesha2_seq_property_bean_set_seq_id(msgs_bean, env, str_seq_id);
sandesha2_seq_property_bean_set_name(msgs_bean, env,
SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES);
@@ -617,7 +616,18 @@
last_app_msg = axis2_property_get_value(property, env);
if(last_app_msg && 0 == axis2_strcmp(last_app_msg,
SANDESHA2_VALUE_TRUE))
- last_msg = AXIS2_TRUE;
+ {
+ axis2_char_t *spec_ver = NULL;
+ spec_ver = sandesha2_utils_get_rm_version(env, internal_seq_id,
+ storage_mgr);
+ printf("came1\n");
+ if(sandesha2_spec_specific_consts_is_last_msg_indicator_reqd
+ (env, spec_ver))
+ {
+ printf("came11\n");
+ last_msg = AXIS2_TRUE;
+ }
+ }
}
property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_CLIENT_MESSAGE_NUMBER, AXIS2_FALSE);
@@ -908,7 +918,7 @@
const axis2_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx,
axis2_char_t *msg_str,
- sandesha2_storage_mgr_t *mgr)
+ sandesha2_storage_mgr_t *storage_mgr)
{
sandesha2_seq_t *seq = NULL;
axis2_char_t *seq_id = NULL;
@@ -923,7 +933,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_str, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, mgr, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
seq = (sandesha2_seq_t*)sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
SANDESHA2_MSG_PART_SEQ);
seq_id = sandesha2_identifier_get_identifier(
@@ -946,7 +956,7 @@
sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
}
ack_rm_msg = sandesha2_ack_mgr_generate_ack_msg(env, rm_msg_ctx, seq_id,
- mgr);
+ storage_mgr);
engine = axis2_engine_create(env, conf_ctx);
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(ack_rm_msg, env);
if(AXIS2_SUCCESS != AXIS2_ENGINE_SEND(engine, env, msg_ctx))
@@ -1109,7 +1119,7 @@
axis2_char_t *internal_seq_id,
long msg_num,
axis2_char_t *storage_key,
- sandesha2_storage_mgr_t *mgr)
+ sandesha2_storage_mgr_t *storage_mgr)
{
axis2_msg_ctx_t *app_msg_ctx = NULL;
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
@@ -1141,11 +1151,11 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, internal_seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_key, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, mgr, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
app_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
- seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(mgr, env);
- retrans_mgr = sandesha2_storage_mgr_get_retrans_mgr(mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr,
env);
+ retrans_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_mgr, env);
to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_TO_EPR);
reply_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
@@ -1187,7 +1197,7 @@
/*if(reply_to_epr)
sandesha2_msg_ctx_set_reply_to(rm_msg_ctx, env, reply_to_epr);*/
- rm_version = sandesha2_utils_get_rm_version(env, internal_seq_id, mgr);
+ rm_version = sandesha2_utils_get_rm_version(env, internal_seq_id,
storage_mgr);
if(!rm_version)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Unable to fine RM spec
version");
@@ -1235,13 +1245,12 @@
axis2_char_t *value = axis2_property_get_value(property, env);
if(value && 0 == axis2_strcmp(value, SANDESHA2_VALUE_TRUE))
{
- axis2_char_t *spec_ver = NULL;
- spec_ver = sandesha2_utils_get_rm_version(env,
- internal_seq_id, mgr);
- last_msg = AXIS2_TRUE;
+ printf("came2\n");
if(sandesha2_spec_specific_consts_is_last_msg_indicator_reqd
- (env, spec_ver))
+ (env, rm_version))
{
+ printf("came22\n");
+ last_msg = AXIS2_TRUE;
sandesha2_seq_set_last_msg(seq, env,
sandesha2_last_msg_create(env, rm_ns_val));
}
@@ -1286,7 +1295,7 @@
SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
}
sandesha2_sender_bean_set_internal_seq_id(app_msg_entry, env,
internal_seq_id);
- sandesha2_storage_mgr_store_msg_ctx(mgr, env, storage_key, app_msg_ctx);
+ sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, storage_key,
app_msg_ctx);
sandesha2_sender_mgr_insert(retrans_mgr, env, app_msg_entry);
property = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_FALSE);
@@ -1324,7 +1333,7 @@
sandesha2_app_msg_processor_get_prev_msg_no(
const axis2_env_t *env,
axis2_char_t *internal_seq_id,
- sandesha2_storage_mgr_t *mgr)
+ sandesha2_storage_mgr_t *storage_mgr)
{
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *next_msg_no_bean = NULL;
@@ -1332,9 +1341,9 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, internal_seq_id, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, mgr, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
- seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr,
env);
next_msg_no_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr,
env, internal_seq_id, SANDESHA2_SEQ_PROP_NEXT_MESSAGE_NUMBER);
@@ -1355,7 +1364,7 @@
const axis2_env_t *env,
axis2_char_t *internal_seq_id,
long msg_num,
- sandesha2_storage_mgr_t *mgr)
+ sandesha2_storage_mgr_t *storage_mgr)
{
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *next_msg_no_bean = NULL;
@@ -1366,7 +1375,7 @@
"[sandesha2]Start:sandesha2_app_msg_processor_set_next_msg_no");
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, internal_seq_id, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, mgr, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
if(msg_num <= 0)
{
@@ -1376,7 +1385,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(mgr, env);
+ seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr,
env);
next_msg_no_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_NEXT_MESSAGE_NUMBER);
if(!next_msg_no_bean)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
