You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by da...@apache.org on 2008/08/27 13:20:45 UTC
svn commit: r689449 - in
/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src:
msgprocessors/app_msg_processor.c msgprocessors/terminate_seq_msg_processor.c
storage/sqlite/permanent_storage_mgr.c util/terminate_mgr.c
Author: damitha
Date: Wed Aug 27 04:20:44 2008
New Revision: 689449
URL: http://svn.apache.org/viewvc?rev=689449&view=rev
Log:
Fixing interoperablity problems
Modified:
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_storage_mgr.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/terminate_mgr.c
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c?rev=689449&r1=689448&r2=689449&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c Wed Aug 27 04:20:44 2008
@@ -2776,14 +2776,12 @@
{
AXIS2_FREE(env->allocator, to_addr);
}
+
if(reply_to_addr)
{
AXIS2_FREE(env->allocator, reply_to_addr);
}
- if(reply_to_epr)
- {
- axis2_endpoint_ref_free(reply_to_epr, env);
- }
+
if(rms_sequence_id)
{
AXIS2_FREE(env->allocator, rms_sequence_id);
@@ -2826,10 +2824,7 @@
{
AXIS2_FREE(env->allocator, reply_to_addr);
}
- if(reply_to_epr)
- {
- axis2_endpoint_ref_free(reply_to_epr, env);
- }
+
if(rms_sequence_id)
{
AXIS2_FREE(env->allocator, rms_sequence_id);
@@ -2992,10 +2987,6 @@
{
AXIS2_FREE(env->allocator, reply_to_addr);
}
- if(reply_to_epr)
- {
- axis2_endpoint_ref_free(reply_to_epr, env);
- }
if(from_acks_to_addr)
{
@@ -3044,14 +3035,12 @@
{
AXIS2_FREE(env->allocator, reply_to_addr);
}
- if(reply_to_epr)
- {
- axis2_endpoint_ref_free(reply_to_epr, env);
- }
+
if(from_acks_to_addr)
{
AXIS2_FREE(env->allocator, from_acks_to_addr);
}
+
if(rms_sequence_id)
{
AXIS2_FREE(env->allocator, rms_sequence_id);
@@ -3210,14 +3199,12 @@
{
AXIS2_FREE(env->allocator, reply_to_addr);
}
- if(reply_to_epr)
- {
- axis2_endpoint_ref_free(reply_to_epr, env);
- }
+
if(from_acks_to_addr)
{
AXIS2_FREE(env->allocator, from_acks_to_addr);
}
+
if(rms_sequence_id)
{
AXIS2_FREE(env->allocator, rms_sequence_id);
@@ -3275,11 +3262,6 @@
AXIS2_FREE(env->allocator, reply_to_addr);
}
- /*if(reply_to_epr)
- {
- axis2_endpoint_ref_free(reply_to_epr, env);
- }*/
-
if(from_acks_to_addr)
{
AXIS2_FREE(env->allocator, from_acks_to_addr);
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_msg_processor.c?rev=689449&r1=689448&r2=689449&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_msg_processor.c Wed Aug 27 04:20:44 2008
@@ -921,7 +921,7 @@
term_added = sandesha2_seq_property_bean_create(env);
sandesha2_seq_property_bean_set_name(term_added, env, SANDESHA2_SEQ_PROP_TERMINATE_ADDED);
- sandesha2_seq_property_bean_set_seq_id(term_added, env, out_seq_id);
+ sandesha2_seq_property_bean_set_seq_id(term_added, env, int_seq_id);
if(out_seq_id)
{
AXIS2_FREE(env->allocator, out_seq_id);
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_storage_mgr.c?rev=689449&r1=689448&r2=689449&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_storage_mgr.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_storage_mgr.c Wed Aug 27 04:20:44 2008
@@ -820,27 +820,37 @@
{
continue;
}
+
if(!axutil_strcmp(AXIS2_TRANSPORT_OUT, key))
{
continue;
}
+
if(!axutil_strcmp(AXIS2_TRANSPORT_IN, key))
{
continue;
}
+
if(!axutil_strcmp(AXIS2_TRANSPORT_HEADERS, key))
{
continue;
}
+
if(!axutil_strcmp(SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, key))
{
continue;
}
+
if(!axutil_strcmp(AXIS2_HTTP_CLIENT, key))
{
continue;
}
+ if(!axutil_strcmp(AXIS2_HTTP_HEADER_CONTENT_LENGTH, key))
+ {
+ continue;
+ }
+
property = (axutil_property_t *) v;
if(property)
{
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/terminate_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/terminate_mgr.c?rev=689449&r1=689448&r2=689449&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/terminate_mgr.c Wed Aug 27 04:20:44 2008
@@ -867,10 +867,10 @@
ack_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(ack_rm_msg_ctx, env);
conf_ctx = axis2_msg_ctx_get_conf_ctx(ack_msg_ctx, env);
- terminated = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, rms_sequence_id,
+ terminated = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, internal_sequence_id,
SANDESHA2_SEQ_PROP_TERMINATE_ADDED);
- if(terminated)
+ /*if(terminated)
{
axis2_char_t *value = sandesha2_seq_property_bean_get_value(terminated, env);
@@ -879,15 +879,12 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[sandesha2] Terminate sequence message was added previously");
- /* If we do not return at this, there will be two terminate messsages
- * sent to the client
- */
sandesha2_seq_property_bean_free(terminated, env);
return AXIS2_SUCCESS;
}
sandesha2_seq_property_bean_free(terminated, env);
- }
+ }*/
terminate_rm_msg_ctx = sandesha2_msg_creator_create_terminate_seq_msg(env, ack_rm_msg_ctx,
rms_sequence_id, internal_sequence_id, seq_prop_mgr);
@@ -1005,7 +1002,7 @@
{
sandesha2_seq_property_bean_set_name(terminate_added, env, SANDESHA2_SEQ_PROP_TERMINATE_ADDED);
- sandesha2_seq_property_bean_set_seq_id(terminate_added, env, rms_sequence_id);
+ sandesha2_seq_property_bean_set_seq_id(terminate_added, env, internal_sequence_id);
sandesha2_seq_property_bean_set_value(terminate_added, env, AXIS2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, terminate_added);
sandesha2_seq_property_bean_free(terminate_added, env);
@@ -1170,6 +1167,7 @@
if(transport_sender)
{
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Resending the terminate message");
/* This is neccessary to avoid a double free */
axis2_msg_ctx_set_property(terminate_msg_ctx, env, AXIS2_TRANSPORT_IN, NULL);
if(!AXIS2_TRANSPORT_SENDER_INVOKE(transport_sender, env, terminate_msg_ctx))
@@ -1222,7 +1220,7 @@
if(terminate_added)
{
sandesha2_seq_property_bean_set_name(terminate_added, env, SANDESHA2_SEQ_PROP_TERMINATE_ADDED);
- sandesha2_seq_property_bean_set_seq_id(terminate_added, env, rms_sequence_id);
+ sandesha2_seq_property_bean_set_seq_id(terminate_added, env, internal_sequence_id);
sandesha2_seq_property_bean_set_value(terminate_added, env, AXIS2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, terminate_added);
sandesha2_seq_property_bean_free(terminate_added, env);
@@ -1280,6 +1278,7 @@
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_engine_t *engine = NULL;
axis2_status_t status = AXIS2_FAILURE;
+ axis2_endpoint_ref_t *to = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2] Entry:sandesha2_terminate_mgr_process_terminate_msg_response");
@@ -1313,6 +1312,13 @@
response_msg_ctx = axis2_msg_ctx_create(env, conf_ctx, axis2_msg_ctx_get_transport_in_desc(msg_ctx,
env), axis2_msg_ctx_get_transport_out_desc(msg_ctx, env));
+ to = axis2_endpoint_ref_create(env,
+ "http://localhost/axis2/services/__ANONYMOUS_SERVICE__/__OPERATION_OUT_IN__");
+ axis2_msg_ctx_set_to(response_msg_ctx, env, to);
+
+ axis2_msg_ctx_set_wsa_action(response_msg_ctx, env,
+ "http://localhost/axis2/services/__ANONYMOUS_SERVICE__/__OPERATION_OUT_IN__");
+
axis2_msg_ctx_set_soap_envelope(response_msg_ctx, env, response_envelope);
/*axis2_msg_ctx_set_server_side(response_msg_ctx, env, AXIS2_TRUE);*/
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org