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/10/27 06:43:26 UTC
svn commit: r468271 - in /webservices/sandesha/trunk/c: include/
samples/client/rm_echo/ samples/client/rm_echo_blocking/
samples/client/rm_ping/ src/handlers/ src/msgprocessors/
src/storage/inmemory/ src/util/ src/workers/ src/wsrm/
Author: damitha
Date: Thu Oct 26 21:43:25 2006
New Revision: 468271
URL: http://svn.apache.org/viewvc?view=rev&rev=468271
Log:
Fixed AXIS2C-310
Modified:
webservices/sandesha/trunk/c/include/sandesha2_in_order_invoker.h
webservices/sandesha/trunk/c/include/sandesha2_sender.h
webservices/sandesha/trunk/c/include/sandesha2_seq.h
webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h
webservices/sandesha/trunk/c/samples/client/rm_echo/rm_echo_client.c
webservices/sandesha/trunk/c/samples/client/rm_echo_blocking/rm_echo_blocking.c
webservices/sandesha/trunk/c/samples/client/rm_ping/rm_ping_client.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_req_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/storage/inmemory/storage_mgr.c
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/util/msg_creator.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
webservices/sandesha/trunk/c/src/util/seq_mgr.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
webservices/sandesha/trunk/c/src/workers/sender.c
webservices/sandesha/trunk/c/src/wsrm/sequence.c
Modified: webservices/sandesha/trunk/c/include/sandesha2_in_order_invoker.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_in_order_invoker.h?view=diff&rev=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_in_order_invoker.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_in_order_invoker.h Thu Oct 26 21:43:25 2006
@@ -73,7 +73,7 @@
run)
(sandesha2_in_order_invoker_t *invoker,
const axis2_env_t *env);
-
+
axis2_status_t (AXIS2_CALL *
free)
(sandesha2_in_order_invoker_t *invoker,
@@ -92,7 +92,20 @@
AXIS2_EXTERN sandesha2_in_order_invoker_t* AXIS2_CALL
sandesha2_in_order_invoker_create(
const axis2_env_t *env);
-
+
+/**
+ * Frees the in_order_invoker given as a void pointer. This method would cast the
+ * void parameter to an in_order_invoker pointer and then call free method.
+ * @param invoker pointer to in_order_invoker as a void pointer
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+sandesha2_in_order_invoker_free_void_arg(
+ void *invoker,
+ const axis2_env_t *env);
+
+
/************************** Start of function macros **************************/
#define SANDESHA2_IN_ORDER_INVOKER_FREE(invoker, env) \
((invoker)->ops->free (invoker, env))
Modified: webservices/sandesha/trunk/c/include/sandesha2_sender.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_sender.h?view=diff&rev=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_sender.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_sender.h Thu Oct 26 21:43:25 2006
@@ -90,6 +90,18 @@
AXIS2_EXTERN sandesha2_sender_t * AXIS2_CALL
sandesha2_sender_create(
const axis2_env_t *env);
+
+/**
+ * Frees the sender given as a void pointer. This method would cast the
+ * void parameter to an sender pointer and then call free method.
+ * @param sender pointer to sender as a void pointer
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+sandesha2_sender_free_void_arg(
+ void *sender,
+ const axis2_env_t *env);
#define SANDESHA2_SENDER_FREE(sender, env) \
(((sandesha2_sender_t *) sender)->ops->free (sender, env))
Modified: webservices/sandesha/trunk/c/include/sandesha2_seq.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_seq.h?view=diff&rev=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_seq.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_seq.h Thu Oct 26 21:43:25 2006
@@ -108,6 +108,12 @@
sandesha2_seq_create(
const axis2_env_t *env,
axis2_char_t *ns_value);
+
+axis2_status_t AXIS2_CALL
+sandesha2_seq_free_void_arg(
+ void *seq,
+ const axis2_env_t *env);
+
/************************** Start of function macros **************************/
#define SANDESHA2_SEQ_SET_IDENTIFIER(seq, env, identifier) \
((seq)->ops->set_identifier (seq, env, identifier))
Modified: webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h?view=diff&rev=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h Thu Oct 26 21:43:25 2006
@@ -167,6 +167,18 @@
sandesha2_storage_mgr_create(
const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx);
+
+/**
+ * Frees the storage_mgr given as a void pointer. This method would cast the
+ * void parameter to an storage_mgr pointer and then call free method.
+ * @param storage_mgr pointer to storage_mgr as a void pointer
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_free_void_arg(
+ void *storage_mgr,
+ const axis2_env_t *env);
sandesha2_storage_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_instance(
Modified: webservices/sandesha/trunk/c/samples/client/rm_echo/rm_echo_client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/client/rm_echo/rm_echo_client.c?view=diff&rev=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/samples/client/rm_echo/rm_echo_client.c (original)
+++ webservices/sandesha/trunk/c/samples/client/rm_echo/rm_echo_client.c Thu Oct 26 21:43:25 2006
@@ -19,7 +19,7 @@
#include <axiom_soap.h>
#include <axis2_client.h>
-#define MAX_COUNT 3000000
+#define MAX_COUNT 10
/* my on_complete callback function */
axis2_status_t AXIS2_CALL
@@ -162,7 +162,6 @@
/* We are done with the callback */
break;
}
- AXIS2_SLEEP(1);
count++;
}
@@ -225,7 +224,7 @@
printf("\necho client invoke SUCCESSFUL!\n");
}
}
- is_complete = 0;
+ is_complete = 1;
return status;
}
Modified: webservices/sandesha/trunk/c/samples/client/rm_echo_blocking/rm_echo_blocking.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/client/rm_echo_blocking/rm_echo_blocking.c?view=diff&rev=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/samples/client/rm_echo_blocking/rm_echo_blocking.c (original)
+++ webservices/sandesha/trunk/c/samples/client/rm_echo_blocking/rm_echo_blocking.c Thu Oct 26 21:43:25 2006
@@ -61,7 +61,7 @@
options = axis2_options_create(env);
AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
AXIS2_OPTIONS_SET_USE_SEPARATE_LISTENER(options, env, AXIS2_TRUE);
- AXIS2_OPTIONS_SET_TIMEOUT_IN_MILLI_SECONDS(options, env, 30000);
+ AXIS2_OPTIONS_SET_TIMEOUT_IN_MILLI_SECONDS(options, env, MAX_COUNT);
/* Seperate listner needs addressing, hence addressing stuff in options */
AXIS2_OPTIONS_SET_ACTION(options, env,
"http://ws.apache.org/axis2/c/samples/echoString");
@@ -114,24 +114,7 @@
property);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload2);
-
- /** Wait till callback is complete. Simply keep the parent thread running
- until our on_complete or on_error is invoked */
- while(count < MAX_COUNT )
- {
- if (is_complete)
- {
- /* We are done with the callback */
- break;
- }
- AXIS2_SLEEP(1);
- count++;
- }
-
- if (!(count < MAX_COUNT))
- {
- printf("\nrm_echo client invoke FAILED. Counter timed out.\n");
- }
+ AXIS2_SLEEP(MAX_COUNT);
if (svc_client)
{
Modified: webservices/sandesha/trunk/c/samples/client/rm_ping/rm_ping_client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/client/rm_ping/rm_ping_client.c?view=diff&rev=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/samples/client/rm_ping/rm_ping_client.c (original)
+++ webservices/sandesha/trunk/c/samples/client/rm_ping/rm_ping_client.c Thu Oct 26 21:43:25 2006
@@ -122,7 +122,7 @@
/** Wait till callback is complete. Simply keep the parent thread running
until our on_complete or on_error is invoked */
- AXIS2_SLEEP(8);
+ AXIS2_SLEEP(MAX_COUNT);
if (svc_client)
{
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c?view=diff&rev=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Thu Oct 26 21:43:25 2006
@@ -156,32 +156,6 @@
return AXIS2_FAILURE;
}
rm_msg_ctx = sandesha2_msg_init_init_msg(env, msg_ctx);
- /* test code */
- reply_to_epr = AXIS2_MSG_CTX_GET_TO(msg_ctx, env);
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
- ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, reply_to_epr);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_SEQ_PROP_REPLY_TO_EPR, property,
- AXIS2_FALSE);
- seq_part = (sandesha2_seq_t *) SANDESHA2_MSG_CTX_GET_MSG_PART(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
- if(seq_part)
- {
- axis2_property_t *property = NULL;
- axis2_op_ctx_t *op_ctx = NULL;
- axis2_ctx_t *ctx = NULL;
-
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, seq_part);
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
- ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WSRM_COMMON_SEQ, property,
- AXIS2_FALSE);
- }
- /* end of test code */
if(AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
@@ -207,7 +181,7 @@
SANDESHA2_TRANSACTION_COMMIT(transaction, env);
prop = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(prop, env, SANDESHA2_VALUE_FALSE);
+ AXIS2_PROPERTY_SET_VALUE(prop, env, AXIS2_STRDUP(SANDESHA2_VALUE_FALSE, env));
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
}
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c?view=diff&rev=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c Thu Oct 26 21:43:25 2006
@@ -148,7 +148,7 @@
transaction = SANDESHA2_STORAGE_MGR_GET_TRANSACTION(storage_mgr, env);
prop = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(prop, env, SANDESHA2_VALUE_TRUE);
+ AXIS2_PROPERTY_SET_VALUE(prop, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE, env));
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop,
AXIS2_FALSE);
}
@@ -165,41 +165,21 @@
msg_type = SANDESHA2_MSG_CTX_GET_MSG_TYPE(rm_msg_ctx, env);
if(msg_type == SANDESHA2_MSG_TYPE_UNKNOWN)
{
- /*axis2_msg_ctx_t *req_msg_ctx = NULL;*/
+ axis2_msg_ctx_t *req_msg_ctx = NULL;
axis2_op_ctx_t *op_ctx = NULL;
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
- /*req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env,
+ req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env,
AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
- if(req_msg_ctx)*/ /* For the server side */
- /* test code */
- if(AXIS2_TRUE == AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env))
+ if(req_msg_ctx) /* For the server side */
{
- /* end test code */
- /* test code */
- axis2_property_t *property = NULL;
- axis2_ctx_t *ctx = NULL;
- /* end test code */
- /*sandesha2_msg_ctx_t *req_rm_msg_ctx = NULL;*/
+ sandesha2_msg_ctx_t *req_rm_msg_ctx = NULL;
sandesha2_seq_t *seq_part = NULL;
- /* test code */
- ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
- property = AXIS2_CTX_GET_PROPERTY(ctx, env,
- SANDESHA2_WSRM_COMMON_SEQ, AXIS2_FALSE);
- if (!property)
- {
- /* it could be the case that RM is not used by client but only
- engaged at server */
- return AXIS2_SUCCESS;
- }
- seq_part = (sandesha2_seq_t *) AXIS2_PROPERTY_GET_VALUE(property,
- env);
- /* end test code */
- /*req_rm_msg_ctx = sandesha2_msg_init_init_msg(env, req_msg_ctx);
+ req_rm_msg_ctx = sandesha2_msg_init_init_msg(env, req_msg_ctx);
seq_part = (sandesha2_seq_t *) SANDESHA2_MSG_CTX_GET_MSG_PART(
req_rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
- */
+
if(seq_part)
{
msg_processor = (sandesha2_msg_processor_t *)
@@ -234,7 +214,7 @@
SANDESHA2_TRANSACTION_ROLLBACK(transaction, env);
prop = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(prop, env, SANDESHA2_VALUE_FALSE);
+ AXIS2_PROPERTY_SET_VALUE(prop, env, AXIS2_STRDUP(SANDESHA2_VALUE_FALSE, env));
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
rolled_back = AXIS2_TRUE;
@@ -251,7 +231,7 @@
SANDESHA2_TRANSACTION_COMMIT(transaction, env);
prop = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(prop, env, SANDESHA2_VALUE_FALSE);
+ AXIS2_PROPERTY_SET_VALUE(prop, env, AXIS2_STRDUP(SANDESHA2_VALUE_FALSE, env));
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
}
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c?view=diff&rev=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Thu Oct 26 21:43:25 2006
@@ -233,10 +233,14 @@
wsa_version = AXIS2_PROPERTY_GET_VALUE(property, env);
property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(wsa_version, env));
- AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env, AXIS2_WSA_VERSION, property,
+ if(property)
+ {
+ AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
+ AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(wsa_version, env));
+ AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env, AXIS2_WSA_VERSION, property,
AXIS2_FALSE);
+ property = NULL;
+ }
addr_ns_val = sandesha2_utils_get_seq_property(env, seq_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE,
@@ -345,13 +349,17 @@
}
}
SANDESHA2_SENDER_BEAN_SET_TIME_TO_SEND(ack_bean, env, time_to_send);
+ /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(ack_msg_ctx, env, AXIS2_TRUE);*/
SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_mgr, env, key, ack_msg_ctx);
SANDESHA2_SENDER_MGR_INSERT(retrans_mgr, env, ack_bean);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(ack_msg_ctx, env);
+ AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(property, env, transport_out);
+ AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
+ axis2_transport_out_desc_free_void_arg);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property,
AXIS2_FALSE);
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=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Thu Oct 26 21:43:25 2006
@@ -371,7 +371,7 @@
highest_in_msg_key_str);
SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_mgr, env,
highest_in_msg_key_str);
- AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, AXIS2_TRUE);
+ /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, AXIS2_TRUE);*/
SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_mgr, env,
highest_in_msg_key_str, msg_ctx);
if(NULL != highest_in_msg_no_str)
@@ -485,7 +485,7 @@
incoming_seq_list_bean);
}
/* save the message */
- AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, AXIS2_TRUE);
+ /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, AXIS2_TRUE);*/
SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_mgr, env, str_key,
msg_ctx);
invoker_bean = sandesha2_invoker_bean_create_with_data(env, str_key,
@@ -1092,6 +1092,7 @@
SANDESHA2_MSG_TYPE_CREATE_SEQ);
SANDESHA2_SENDER_MGR_INSERT(retransmitter_man, env,
create_seq_entry);
+ /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(create_seq_msg, env, AXIS2_TRUE);*/
SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(mgr, env, str_key, create_seq_msg);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
@@ -1101,8 +1102,6 @@
orig_trans_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(create_seq_msg, env);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
- orig_trans_out->ops->free_void_arg);
AXIS2_PROPERTY_SET_VALUE(property, env, orig_trans_out);
AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
orig_trans_out->ops->free_void_arg);
@@ -1229,14 +1228,16 @@
axis2_op_ctx_t *op_ctx = NULL;
axis2_ctx_t *ctx = NULL;
axis2_property_t *property = NULL;
- /*req_rm_msg = sandesha2_msg_init_init_msg(env, req_msg);
+ sandesha2_msg_ctx_t *req_rm_msg = NULL;
+
+ req_rm_msg = sandesha2_msg_init_init_msg(env, req_msg);
req_seq = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(req_rm_msg,
- env, SANDESHA2_MSG_PART_SEQ);*/
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(app_msg_ctx, env);
+ env, SANDESHA2_MSG_PART_SEQ);
+ /*op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(app_msg_ctx, env);
ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_WSRM_COMMON_SEQ,
AXIS2_FALSE);
- req_seq = (sandesha2_seq_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
+ req_seq = (sandesha2_seq_t *) AXIS2_PROPERTY_GET_VALUE(property, env);*/
if(NULL == req_seq)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Sequence not found");
@@ -1322,7 +1323,7 @@
SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
}
SANDESHA2_SENDER_BEAN_SET_INTERNAL_SEQ_ID(app_msg_entry, env, internal_seq_id);
- AXIS2_MSG_CTX_SET_KEEP_ALIVE(app_msg_ctx, env, AXIS2_TRUE);
+ /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(app_msg_ctx, env, AXIS2_TRUE);*/
SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(mgr, env, storage_key, app_msg_ctx);
SANDESHA2_SENDER_MGR_INSERT(retransmitter_man, env, app_msg_entry);
@@ -1359,7 +1360,7 @@
AXIS2_MSG_CTX_SET_CURRENT_HANDLER_INDEX(app_msg_ctx, env,
AXIS2_MSG_CTX_GET_CURRENT_HANDLER_INDEX(app_msg_ctx, env) + 1);
engine = axis2_engine_create(env, AXIS2_MSG_CTX_GET_CONF_CTX(app_msg_ctx, env));
- AXIS2_MSG_CTX_SET_KEEP_ALIVE(app_msg_ctx, env, AXIS2_FALSE);
+ /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(app_msg_ctx, env, AXIS2_FALSE);*/
return AXIS2_ENGINE_RESUME_SEND(engine, env, app_msg_ctx);
}
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=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Thu Oct 26 21:43:25 2006
@@ -312,8 +312,6 @@
highest_msg_key, conf_ctx);
if(highest_in_msg)
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(highest_in_msg, env);
- /* temporarily comment this and add the line below. This is because
- * highest_out_msg is gargage otherwise */
if(op_ctx)
highest_out_msg = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env,
AXIS2_WSDL_MESSAGE_LABEL_OUT_VALUE);
@@ -551,6 +549,7 @@
key = axis2_uuid_gen(env);
term_bean = sandesha2_sender_bean_create(env);
SANDESHA2_SENDER_BEAN_SET_MSG_CONTEXT_REF_KEY(term_bean, env, key);
+ /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, AXIS2_TRUE);*/
SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_man, env, key, msg_ctx);
/* TODO: refine the terminate delay */
@@ -586,6 +585,8 @@
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(property, env, out_desc);
+ AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
+ axis2_transport_out_desc_free_void_arg);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property,
AXIS2_FALSE);
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c?view=diff&rev=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c Thu Oct 26 21:43:25 2006
@@ -239,6 +239,19 @@
}
axis2_status_t AXIS2_CALL
+sandesha2_storage_mgr_free_void_arg(
+ void *storage_mgr,
+ const axis2_env_t *env)
+{
+ sandesha2_storage_mgr_t *storage_mgr_l = NULL;
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ storage_mgr_l = (sandesha2_storage_mgr_t *) storage_mgr;
+ return sandesha2_storage_mgr_free(storage_mgr_l, env);
+ return AXIS2_SUCCESS;
+}
+
+axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_free(
void *storage,
const axis2_env_t *env)
@@ -479,6 +492,7 @@
storage_map = axis2_hash_make(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(property, env, storage_map);
+ AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_hash_free_void_arg);
AXIS2_CTX_SET_PROPERTY(ctx, env, storage_impl->SANDESHA2_MSG_MAP_KEY,
property, AXIS2_FALSE);
}
@@ -486,6 +500,7 @@
{
key = axis2_uuid_gen(env);
}
+ AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, AXIS2_TRUE);
axis2_hash_set(storage_map, key, AXIS2_HASH_KEY_STRING, msg_ctx);
return AXIS2_SUCCESS;
}
@@ -570,6 +585,7 @@
entry = axis2_hash_get(storage_map, key, AXIS2_HASH_KEY_STRING);
if(entry)
{
+ /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, AXIS2_FALSE);*/
axis2_hash_set(storage_map, key, AXIS2_HASH_KEY_STRING, NULL);
}
return AXIS2_SUCCESS;
Modified: webservices/sandesha/trunk/c/src/util/ack_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/ack_mgr.c?view=diff&rev=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Thu Oct 26 21:43:25 2006
@@ -94,16 +94,23 @@
property = AXIS2_MSG_CTX_GET_PROPERTY(ref_msg, env, AXIS2_WSA_VERSION,
AXIS2_FALSE);
if(property)
+ {
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env, AXIS2_WSA_VERSION, property,
AXIS2_FALSE);
+ property = NULL;
+ }
property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE,
+ if(property)
+ {
+ AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
+ AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE,
env));
- AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
+ AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property,
AXIS2_FALSE);
+ property = NULL;
+ }
ack_rm_msg = sandesha2_msg_init_init_msg(env, ack_msg_ctx);
SANDESHA2_MSG_CTX_SET_RM_NS_VAL(ack_rm_msg, env,
SANDESHA2_MSG_CTX_GET_RM_NS_VAL(ref_rm_msg, env));
@@ -123,15 +130,16 @@
if(addr_ns_uri)
{
property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(addr_ns_uri, env));
+ if(property)
+ {
+ AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
+ AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(addr_ns_uri, env));
+ AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env, AXIS2_WSA_VERSION, property,
+ AXIS2_FALSE);
+ property = NULL;
+ }
}
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri);
- if(property)
- {
- AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env, AXIS2_WSA_VERSION, property,
- AXIS2_FALSE);
- }
if(0 == AXIS2_STRCMP(acks_to_str, anon_uri))
{
axis2_ctx_t *ref_ctx = NULL;
@@ -157,10 +165,10 @@
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
SANDESHA2_VALUE_TRUE, env));
- /* AXIS2_MSG_CTX_SET_PROPERTY(ref_msg, env, SANDESHA2_ACK_WRITTEN, property,
- AXIS2_FALSE);*/
- AXIS2_CTX_SET_PROPERTY(ref_ctx, env, SANDESHA2_ACK_WRITTEN, property,
- AXIS2_FALSE);
+ AXIS2_MSG_CTX_SET_PROPERTY(ref_msg, env, SANDESHA2_ACK_WRITTEN, property,
+ AXIS2_FALSE);
+ /*AXIS2_CTX_SET_PROPERTY(ref_ctx, env, SANDESHA2_ACK_WRITTEN, property,
+ AXIS2_FALSE);*/
AXIS2_MSG_CTX_SET_SERVER_SIDE(ack_msg_ctx, env, AXIS2_TRUE);
return ack_rm_msg;
}
@@ -226,6 +234,7 @@
old_ack_bean, env));
}
SANDESHA2_SENDER_BEAN_SET_TIME_TO_SEND(ack_bean, env, time_to_send);
+ /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(ack_msg_ctx, env, AXIS2_TRUE);*/
SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_mgr, env, key, ack_msg_ctx);
SANDESHA2_SENDER_MGR_INSERT(retrans_mgr, env, ack_bean);
@@ -234,6 +243,8 @@
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(property, env, orig_trans_out);
+ AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
+ axis2_transport_out_desc_free_void_arg);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property,
AXIS2_FALSE);
Modified: webservices/sandesha/trunk/c/src/util/msg_creator.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_creator.c?view=diff&rev=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Thu Oct 26 21:43:25 2006
@@ -526,7 +526,8 @@
if(AXIS2_TRUE != is_seq_res_reqd)
{
- AXIS2_CTX_SET_PROPERTY(terminate_seq_msg_ctx, env, AXIS2_TRANSPORT_IN, NULL, AXIS2_FALSE);
+ AXIS2_CTX_SET_PROPERTY(terminate_seq_msg_ctx, env, AXIS2_TRANSPORT_IN,
+ NULL, AXIS2_FALSE);
}
terminate_rm_msg = sandesha2_msg_init_init_msg(env, terminate_seq_msg_ctx);
if(terminate_rm_msg == NULL)
Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?view=diff&rev=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Thu Oct 26 21:43:25 2006
@@ -362,6 +362,8 @@
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(property, env, invoker);
+ AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
+ sandesha2_in_order_invoker_free_void_arg);
AXIS2_CTX_SET_PROPERTY(AXIS2_CONF_CTX_GET_BASE(conf_ctx, env),
env, SANDESHA2_INVOKER, property, AXIS2_FALSE);
}
@@ -392,6 +394,8 @@
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(property, env, sender);
+ AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
+ sandesha2_sender_free_void_arg);
AXIS2_CTX_SET_PROPERTY(AXIS2_CONF_CTX_GET_BASE(conf_ctx, env),
env, SANDESHA2_SENDER, property, AXIS2_FALSE);
}
@@ -450,6 +454,8 @@
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(property, env, storage_mgr);
+ AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
+ sandesha2_storage_mgr_free_void_arg);
AXIS2_CTX_SET_PROPERTY(AXIS2_CONF_CTX_GET_BASE(conf_ctx, env),
env, SANDESHA2_INMEMORY_STORAGE_MGR, property,
AXIS2_FALSE);
Modified: webservices/sandesha/trunk/c/src/util/seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/seq_mgr.c?view=diff&rev=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Thu Oct 26 21:43:25 2006
@@ -381,9 +381,10 @@
axis2_op_ctx_t *op_ctx = NULL;
axis2_endpoint_ref_t *reply_to_epr = NULL;
axis2_property_t *property = NULL;
+ axis2_msg_ctx_t *req_msg_ctx = NULL;
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(first_app_msg, env);
- /*req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env,
+ req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env,
AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
if(NULL == req_msg_ctx)
{
@@ -391,11 +392,11 @@
" the request message from the operation context");
return AXIS2_FAILURE;
}
- reply_to_epr = AXIS2_MSG_CTX_GET_TO(req_msg_ctx, env);*/
- ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
+ reply_to_epr = AXIS2_MSG_CTX_GET_TO(req_msg_ctx, env);
+ /*ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
SANDESHA2_SEQ_PROP_REPLY_TO_EPR, AXIS2_FALSE);
- reply_to_epr = AXIS2_PROPERTY_GET_VALUE(property, env);
+ reply_to_epr = AXIS2_PROPERTY_GET_VALUE(property, env);*/
if(NULL != reply_to_epr)
reply_to_bean = sandesha2_seq_property_bean_create_with_data(env,
int_seq_id, SANDESHA2_SEQ_PROP_REPLY_TO_EPR,
Modified: webservices/sandesha/trunk/c/src/util/terminate_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/terminate_mgr.c?view=diff&rev=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Thu Oct 26 21:43:25 2006
@@ -456,6 +456,7 @@
sandesha2_storage_mgr_t *storage_man)
{
axis2_msg_ctx_t *msg_ctx = NULL;
+ axis2_msg_ctx_t *terminate_msg_ctx = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *terminated = NULL;
@@ -546,8 +547,9 @@
key = axis2_uuid_gen(env);
terminate_bean = sandesha2_sender_bean_create(env);
SANDESHA2_SENDER_BEAN_SET_MSG_CONTEXT_REF_KEY(terminate_bean, env, key);
- SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_man, env, key,
- SANDESHA2_MSG_CTX_GET_MSG_CTX(terminate_rm_msg, env));
+ terminate_msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(terminate_rm_msg, env);
+ /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(terminate_msg_ctx, env, AXIS2_TRUE);*/
+ SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_man, env, key, terminate_msg_ctx);
SANDESHA2_SENDER_BEAN_SET_TIME_TO_SEND(terminate_bean, env,
sandesha2_utils_get_current_time_in_millis(env) +
SANDESHA2_TERMINATE_DELAY);
@@ -582,6 +584,8 @@
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(property, env, transport_out);
+ AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
+ axis2_transport_out_desc_free_void_arg);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx1, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property,
AXIS2_FALSE);
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=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Thu Oct 26 21:43:25 2006
@@ -144,6 +144,17 @@
return &(invoker_impl->invoker);
}
+axis2_status_t AXIS2_CALL
+sandesha2_in_order_invoker_free_void_arg(
+ void *invoker,
+ const axis2_env_t *env)
+{
+ sandesha2_in_order_invoker_t *invoker_l = NULL;
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ invoker_l = (sandesha2_in_order_invoker_t *) invoker;
+ return sandesha2_in_order_invoker_free(invoker_l, env);
+}
axis2_status_t AXIS2_CALL
sandesha2_in_order_invoker_free(sandesha2_in_order_invoker_t *invoker,
@@ -290,9 +301,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_WSA_VERSION, property,
+ AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_WSA_VERSION, NULL,
AXIS2_FALSE);
AXIS2_MSG_CTX_SET_MESSAGE_ID(msg_ctx, env, NULL);
AXIS2_MSG_CTX_SET_TO(msg_ctx, env, NULL);
Modified: webservices/sandesha/trunk/c/src/workers/sender.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender.c?view=diff&rev=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender.c Thu Oct 26 21:43:25 2006
@@ -167,6 +167,17 @@
return &(sender_impl->sender);
}
+axis2_status_t AXIS2_CALL
+sandesha2_sender_free_void_arg(
+ void *sender,
+ const axis2_env_t *env)
+{
+ sandesha2_sender_t *sender_l = NULL;
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ sender_l = (sandesha2_sender_t *) sender;
+ return sandesha2_sender_free(sender_l, env);
+}
axis2_status_t AXIS2_CALL
sandesha2_sender_free(sandesha2_sender_t *sender,
@@ -355,9 +366,6 @@
AXIS2_HTTP_CHAR_SET_ENCODING, AXIS2_CTX_GET_PROPERTY(ctx, env,
AXIS2_HTTP_CHAR_SET_ENCODING, AXIS2_FALSE), AXIS2_FALSE);
}
- /* test code */
- AXIS2_MSG_CTX_SET_OP_CTX(res_msg_ctx, env, req_op_ctx);
- /* end test code */
}
AXIS2_MSG_CTX_SET_DOING_REST(res_msg_ctx, env, AXIS2_MSG_CTX_GET_DOING_REST(
msg_ctx, env));
@@ -592,7 +600,7 @@
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, property, AXIS2_FALSE);
/* Consider building soap envelope */
- AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, AXIS2_FALSE);
+ /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, AXIS2_FALSE);*/
AXIS2_TRANSPORT_SENDER_INVOKE(transport_sender, env, msg_ctx);
successfully_sent = AXIS2_TRUE;
sender_impl->counter++;
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=468271&r1=468270&r2=468271
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/sequence.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/sequence.c Thu Oct 26 21:43:25 2006
@@ -195,6 +195,17 @@
return &(seq_impl->seq);
}
+axis2_status_t AXIS2_CALL
+sandesha2_seq_free_void_arg(
+ void *seq,
+ const axis2_env_t *env)
+{
+ sandesha2_seq_t *seq_l = NULL;
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ seq_l = (sandesha2_seq_t *) seq;
+ return sandesha2_seq_free(seq_l, env);
+}
axis2_status_t AXIS2_CALL
sandesha2_seq_free (sandesha2_iom_rm_element_t *seq,
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org