ws-sandesha-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r689747 - in /webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008: config/ include/ src/msgprocessors/ src/polling/ src/util/ src/wsrm/
Date Thu, 28 Aug 2008 07:41:12 GMT
Author: damitha
Date: Thu Aug 28 00:41:10 2008
New Revision: 689747

URL: http://svn.apache.org/viewvc?rev=689747&view=rev
Log:
updating rm 1.1 make connection model

Modified:
    webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/config/module.xml
    webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_constants.h
    webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_make_connection.h
    webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/make_connection_msg_processor.c
    webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/polling/polling_mgr.c
    webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/msg_creator.c
    webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/msg_init.c
    webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/wsrm/Makefile.am
    webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/wsrm/make_connection.c
    webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/wsrm/rm_elements.c

Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/config/module.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/config/module.xml?rev=689747&r1=689746&r2=689747&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/config/module.xml
(original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/config/module.xml
Thu Aug 28 00:41:10 2008
@@ -61,7 +61,7 @@
         <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200702/CloseSequence</actionMapping>
         <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200702/TerminateSequenceResponse</actionMapping>
         <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200702/CloseSequenceResponse</actionMapping>
-        <actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200702/MakeConnection</actionMapping>
+        <actionMapping>http://docs.oasis-open.org/ws-rx/wsmc/200702/MakeConnection</actionMapping>
         
 
     </operation>
@@ -78,7 +78,7 @@
     <parameter name="MaxRetransCount" locked="false">10</parameter>
     <parameter name="SenderSleepTime" locked="false">1</parameter><!--In seconds-->
     <parameter name="InvokerSleepTime" locked="false">1</parameter>
-    <parameter name="PollingWaitTime" locked="false">2</parameter>
+    <parameter name="PollingWaitTime" locked="false">4</parameter>
     <parameter name="TerminateDelay" locked="false">4</parameter>
 
 </module>

Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_constants.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_constants.h?rev=689747&r1=689746&r2=689747&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_constants.h
(original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_constants.h
Thu Aug 28 00:41:10 2008
@@ -63,6 +63,8 @@
 	 */
 			
 	#define SANDESHA2_SPEC_2007_02_NS_URI  "http://docs.oasis-open.org/ws-rx/wsrm/200702"
+	
+    #define MAKE_CONNECTION_SPEC_2007_02_NS_URI  "http://docs.oasis-open.org/ws-rx/wsmc/200702"
 		
 	#define SANDESHA2_SPEC_2007_02_ACTION_CREATE_SEQ  "http://docs.oasis-open.org/ws-rx/wsrm/200702/CreateSequence"
 
@@ -79,7 +81,7 @@
 	#define SANDESHA2_SPEC_2007_02_ACTION_CLOSE_SEQ  "http://docs.oasis-open.org/ws-rx/wsrm/200702/CloseSequence"
 			
 	#define SANDESHA2_SPEC_2007_02_ACTION_CLOSE_SEQ_RESPONSE  "http://docs.oasis-open.org/ws-rx/wsrm/200702/CloseSequenceResponse"
-	#define SANDESHA2_SPEC_2007_02_ACTION_MAKE_CONNECTION "http://docs.oasis-open.org/ws-rx/wsrm/200702/MakeConnection"
+	#define SANDESHA2_SPEC_2007_02_ACTION_MAKE_CONNECTION "http://docs.oasis-open.org/ws-rx/wsmc/200702/MakeConnection"
 
 	#define SANDESHA2_SPEC_2007_02_SOAP_ACTION_CREATE_SEQ  "http://docs.oasis-open.org/ws-rx/wsrm/200702/CreateSequence"
 
@@ -95,12 +97,14 @@
 			
 	#define SANDESHA2_SPEC_2007_02_SOAP_ACTION_CLOSE_SEQ  "http://docs.oasis-open.org/ws-rx/wsrm/200702/CloseSequence"
      
-    #define SANDESHA2_SPEC_2007_02_SOAP_ACTION_MAKE_CONNECTION "http://docs.oasis-open.org/ws-rx/wsrm/200702/MakeConnection"
+    #define SANDESHA2_SPEC_2007_02_SOAP_ACTION_MAKE_CONNECTION "http://docs.oasis-open.org/ws-rx/wsmc/200702/MakeConnection"
 	/**
 	 * WSRM Common constants
 	 */
 
 	#define SANDESHA2_WSRM_COMMON_NS_PREFIX_RM  "wsrm"
+	
+    #define SANDESHA2_WSMC_COMMON_NS_PREFIX_RM  "wsmc"
 
 	#define SANDESHA2_WSRM_COMMON_MSG_NUMBER  "MessageNumber"
 
@@ -167,6 +171,8 @@
 	#define SANDESHA2_WSA_NS_PREFIX_ADDRESSING  "wsa"
 
 	#define SANDESHA2_WSA_ADDRESS  "Address"
+	
+    #define SANDESHA2_WSMC_ADDRESS  "Address"
 
 	#define SANDESHA2_WSA_SOAP_FAULT_ACTION  "http://schemas.xmlsoap.org/ws/2004/08/addressing/fault"
 

Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_make_connection.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_make_connection.h?rev=689747&r1=689746&r2=689747&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_make_connection.h
(original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/include/sandesha2_make_connection.h
Thu Aug 28 00:41:10 2008
@@ -24,7 +24,7 @@
 
 #include <axiom_soap_envelope.h>
 #include <sandesha2_identifier.h>
-#include <sandesha2_address.h>
+#include <sandesha2_mc_address.h>
 #include <sandesha2_error.h>
 
 
@@ -71,7 +71,7 @@
     const axutil_env_t *env, 
     sandesha2_identifier_t *identifier);
                     	
-sandesha2_address_t * AXIS2_CALL
+sandesha2_mc_address_t * AXIS2_CALL
 sandesha2_make_connection_get_address(
     sandesha2_make_connection_t *make_conn,
     const axutil_env_t *env);
@@ -80,7 +80,7 @@
 sandesha2_make_connection_set_address(
     sandesha2_make_connection_t *make_conn,
     const axutil_env_t *env, 
-    sandesha2_address_t *address);
+    sandesha2_mc_address_t *address);
 
 axis2_status_t AXIS2_CALL
 sandesha2_make_connection_to_soap_envelope(

Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/make_connection_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/make_connection_msg_processor.c?rev=689747&r1=689746&r2=689747&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/make_connection_msg_processor.c
(original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/make_connection_msg_processor.c
Thu Aug 28 00:41:10 2008
@@ -229,7 +229,7 @@
     sandesha2_create_seq_mgr_t *create_seq_mgr = NULL;
     sandesha2_sender_bean_t *sender_bean = NULL;
     sandesha2_sender_bean_t *bean1 = NULL;
-    sandesha2_address_t *address = NULL;
+    sandesha2_mc_address_t *address = NULL;
     sandesha2_identifier_t *identifier = NULL;
     sandesha2_msg_ctx_t *return_rm_msg_ctx = NULL;
     axutil_property_t *property = NULL;
@@ -646,6 +646,11 @@
             AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] ack msg type is still
not supported");
             continue;
         }
+        
+        if(msg_type == SANDESHA2_MSG_TYPE_MAKE_CONNECTION_MSG)
+        {
+            continue;
+        }
 
         if(msg_type == SANDESHA2_MSG_TYPE_APPLICATION)
         {

Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/polling/polling_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/polling/polling_mgr.c?rev=689747&r1=689746&r2=689747&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/polling/polling_mgr.c
(original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/polling/polling_mgr.c
Thu Aug 28 00:41:10 2008
@@ -82,7 +82,7 @@
 {
     axutil_thread_t *worker_thread = NULL;
     sandesha2_polling_mgr_args_t *args = NULL;
-    axis2_char_t *wsrm_anon_reply_to_uri = NULL;
+    axis2_char_t *wsmc_anon_reply_to_uri = NULL;
     sandesha2_msg_ctx_t *make_conn_rm_msg_ctx = NULL;
     axis2_char_t *make_conn_msg_store_key = NULL;
     axis2_msg_ctx_t *make_conn_msg_ctx = NULL;
@@ -100,12 +100,17 @@
 
     if(sandesha2_utils_is_wsrm_anon_reply_to(env, reply_to))
     {
-        wsrm_anon_reply_to_uri = (axis2_char_t *) reply_to;
+        wsmc_anon_reply_to_uri = axutil_strcat(env, AXIS2_WS_RM_ANONYMOUS_URL, sequence_id,
NULL);
     }
 
     make_conn_rm_msg_ctx = sandesha2_msg_creator_create_make_connection_msg(env, rm_msg_ctx,

-        sequence_id, internal_sequence_id, wsrm_anon_reply_to_uri, NULL);
-    
+        sequence_id, internal_sequence_id, wsmc_anon_reply_to_uri, NULL);
+   
+    if(wsmc_anon_reply_to_uri)
+    {
+        AXIS2_FREE(env->allocator, wsmc_anon_reply_to_uri);
+    }
+
     args->rm_msg_ctx = make_conn_rm_msg_ctx;
 
     make_conn_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(make_conn_rm_msg_ctx, env);
@@ -296,9 +301,9 @@
              AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI:
              AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
 
-            AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, 
-                "[sandesha2] Sending the make connection message for the sequence with internal
"\
-                "sequence id %s", internal_sequence_id);
+        AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, 
+            "[sandesha2] Sending make connection message for sequence with internal sequence
id %s", 
+            internal_sequence_id);
 
         transport_out = axis2_msg_ctx_get_transport_out_desc(make_conn_msg_ctx, env);
         if(transport_out)

Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/msg_creator.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/msg_creator.c?rev=689747&r1=689746&r2=689747&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/msg_creator.c
(original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/msg_creator.c
Thu Aug 28 00:41:10 2008
@@ -1039,11 +1039,14 @@
     axis2_msg_ctx_t *ref_msg_ctx = NULL;
     axis2_msg_ctx_t *make_conn_msg_ctx = NULL;
     axis2_char_t *rm_ns_value = NULL;
+    axis2_char_t *mc_ns_value = NULL;
     axis2_char_t *wsa_action = NULL;
     sandesha2_make_connection_t *make_conn = NULL;
     sandesha2_msg_ctx_t *make_conn_rm_msg_ctx = NULL;
    
     rm_ns_value = sandesha2_spec_specific_consts_get_rm_ns_val(env, SANDESHA2_SPEC_VERSION_1_1);
+    
+    mc_ns_value = MAKE_CONNECTION_SPEC_2007_02_NS_URI;
 
     if(ref_rm_msg_ctx)
     {
@@ -1099,7 +1102,7 @@
         }
     }*/
 
-    make_conn = sandesha2_make_connection_create(env, rm_ns_value);
+    make_conn = sandesha2_make_connection_create(env, mc_ns_value);
     if(make_conn_seq_id)
     {
         sandesha2_identifier_t *identifier = sandesha2_identifier_create(env, 
@@ -1113,12 +1116,18 @@
 
     if(make_conn_anon_uri)
     {
-        sandesha2_address_t *address = sandesha2_address_create(env, rm_ns_value, NULL);
-        axis2_endpoint_ref_t *epr = axis2_endpoint_ref_create(env, make_conn_anon_uri);
+        sandesha2_mc_address_t *address = NULL;
+        axis2_endpoint_ref_t *epr = NULL;
+
+        AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] make_conn_anon_uri:%s", 
+                make_conn_anon_uri);
+
+        address = sandesha2_mc_address_create(env, mc_ns_value, NULL);
+        epr = axis2_endpoint_ref_create(env, make_conn_anon_uri);
 
         if(address)
         {
-            sandesha2_address_set_epr(address, env, epr);
+            sandesha2_mc_address_set_epr(address, env, epr);
         }
 
         if(make_conn)
@@ -1142,11 +1151,11 @@
         reply_to = axis2_endpoint_ref_create(env, AXIS2_WSA_ANONYMOUS_URL);
         axis2_msg_ctx_set_reply_to(make_conn_msg_ctx, env, reply_to);
         wsa_action = sandesha2_spec_specific_consts_get_make_connection_action(env, SANDESHA2_SPEC_VERSION_1_1);
-        AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "action:%s", wsa_action);
         axis2_msg_ctx_set_wsa_action(make_conn_msg_ctx, env, wsa_action);
         soap_action = axutil_string_create(env, wsa_action);
         axis2_msg_ctx_set_soap_action(make_conn_msg_ctx, env, soap_action);
         axis2_msg_ctx_set_message_id(make_conn_msg_ctx, env, axutil_uuid_gen(env));
+    
         sandesha2_msg_ctx_set_make_connection(make_conn_rm_msg_ctx, env, make_conn);
 
        /* Generating the soap envelope */

Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/msg_init.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/msg_init.c?rev=689747&r1=689746&r2=689747&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/msg_init.c
(original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/msg_init.c
Thu Aug 28 00:41:10 2008
@@ -370,9 +370,9 @@
     else if(make_conn)
     {
         sandesha2_identifier_t *idf = NULL;
-        sandesha2_address_t *address = NULL;
-        sandesha2_msg_ctx_set_msg_type(rm_msg_ctx, env, 
-            SANDESHA2_MSG_TYPE_MAKE_CONNECTION_MSG);
+        sandesha2_mc_address_t *address = NULL;
+
+        sandesha2_msg_ctx_set_msg_type(rm_msg_ctx, env, SANDESHA2_MSG_TYPE_MAKE_CONNECTION_MSG);
         idf = sandesha2_make_connection_get_identifier(make_conn, env);
         address = sandesha2_make_connection_get_address(make_conn, env);
         if(idf)

Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/wsrm/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/wsrm/Makefile.am?rev=689747&r1=689746&r2=689747&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/wsrm/Makefile.am
(original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/wsrm/Makefile.am
Thu Aug 28 00:41:10 2008
@@ -5,6 +5,7 @@
                                identifier.c\
                                endpoint.c\
                                address.c\
+                               mc_address.c\
                                acks_to.c\
 							   nack.c\
                                accept.c\

Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/wsrm/make_connection.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/wsrm/make_connection.c?rev=689747&r1=689746&r2=689747&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/wsrm/make_connection.c
(original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/wsrm/make_connection.c
Thu Aug 28 00:41:10 2008
@@ -29,7 +29,7 @@
 struct sandesha2_make_connection_t
 {
 	sandesha2_identifier_t *identifier;
-	sandesha2_address_t *address;
+	sandesha2_mc_address_t *address;
 	axis2_char_t *ns_val;
 };
 
@@ -169,13 +169,13 @@
     }
     if(address_element)
     {
-        make_conn->address = sandesha2_address_create(env, 
+        make_conn->address = sandesha2_mc_address_create(env, 
             make_conn->ns_val, NULL);
         if(!make_conn->address)
         {
             return NULL;
         }
-        sandesha2_address_from_om_node(make_conn->address, env, om_node);
+        sandesha2_mc_address_from_om_node(make_conn->address, env, om_node);
     }
     return make_conn;
 }
@@ -194,33 +194,45 @@
     AXIS2_PARAM_CHECK(env->error, om_node, NULL);
     
     soap_body = (axiom_soap_body_t*)om_node;
+
     if(!make_conn->identifier && !make_conn->address)
     {
         AXIS2_ERROR_SET(env->error, 
-            SANDESHA2_ERROR_INVALID_MAKE_CONNECTION_BOTH_IDENTIFER_AND_ADDRESS_NULL, 
-            AXIS2_FAILURE);
-        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Invalid MakeConnection " \
-            "object. Both Identifier and Address are null");
+            SANDESHA2_ERROR_INVALID_MAKE_CONNECTION_BOTH_IDENTIFER_AND_ADDRESS_NULL, AXIS2_FAILURE);
+
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
+                "Invalid MakeConnection object. Both Identifier and Address are null");
         return NULL;
     }
-    rm_ns = axiom_namespace_create(env, make_conn->ns_val,
-        SANDESHA2_WSRM_COMMON_NS_PREFIX_RM);
+
+    rm_ns = axiom_namespace_create(env, make_conn->ns_val, SANDESHA2_WSMC_COMMON_NS_PREFIX_RM);
     if(!rm_ns)
     {
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Creating namespace for make
connection failed");
         return NULL;
     }
-    make_conn_element = axiom_element_create(env, NULL, 
-        SANDESHA2_WSRM_COMMON_MAKE_CONNECTION, rm_ns, &make_conn_node);
+
+    make_conn_element = axiom_element_create(env, NULL, SANDESHA2_WSRM_COMMON_MAKE_CONNECTION,

+            rm_ns, &make_conn_node);
+
     if(!make_conn_element)
     {
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Creating make connection
element failed");
         return NULL;
     }
+
     if(make_conn->identifier)
-        sandesha2_identifier_to_om_node(make_conn->identifier, env, 
-            make_conn_node);
+    {
+        sandesha2_identifier_to_om_node(make_conn->identifier, env, make_conn_node);
+    }
+
     if(make_conn->address)
-        sandesha2_address_to_om_node(make_conn->address, env, make_conn_node);
+    {
+        sandesha2_mc_address_to_om_node(make_conn->address, env, make_conn_node);
+    }
+
     axiom_soap_body_add_child(soap_body, env, make_conn_node);
+
     return axiom_soap_body_get_base_node(soap_body, env);
 }
 
@@ -242,7 +254,7 @@
  	return AXIS2_SUCCESS;
 }
 
-sandesha2_address_t * AXIS2_CALL
+sandesha2_mc_address_t * AXIS2_CALL
 sandesha2_make_connection_get_address(
     sandesha2_make_connection_t *make_conn,
     const axutil_env_t *env)
@@ -254,7 +266,7 @@
 sandesha2_make_connection_set_address(
     sandesha2_make_connection_t *make_conn,
     const axutil_env_t *env, 
-    sandesha2_address_t *address)
+    sandesha2_mc_address_t *address)
 {
 	make_conn->address = address;
  	return AXIS2_SUCCESS;
@@ -274,7 +286,7 @@
     axutil_qname_t *make_conn_qname = NULL;
     
     AXIS2_PARAM_CHECK(env->error, envelope, AXIS2_FAILURE);
-	
+    
     soap_body = axiom_soap_envelope_get_body(envelope, env);
     if(soap_body)
         body_node = axiom_soap_body_get_base_node(soap_body, env);
@@ -284,6 +296,7 @@
         SANDESHA2_WSRM_COMMON_MAKE_CONNECTION, make_conn->ns_val, NULL);
     if(!make_conn_qname)
     {
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Could not create qname for
make connection");
         return AXIS2_FAILURE;
     }
     if(body_element)
@@ -296,6 +309,7 @@
      */
     if(node)
         axiom_node_detach(node, env);
+
     sandesha2_make_connection_to_om_node(make_conn, env, soap_body);
 	return AXIS2_SUCCESS;
 }
@@ -305,14 +319,21 @@
     const axutil_env_t *env, 
     axis2_char_t *namespace)
 {
-    if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI))
+    if(!axutil_strcmp(namespace, SANDESHA2_SPEC_2005_02_NS_URI))
     {
         return AXIS2_FALSE;
     }
-    if(0 == axutil_strcmp(namespace, SANDESHA2_SPEC_2007_02_NS_URI))
+
+    if(!axutil_strcmp(namespace, SANDESHA2_SPEC_2007_02_NS_URI))
+    {
+        return AXIS2_FALSE;
+    }
+    
+    if(!axutil_strcmp(namespace, MAKE_CONNECTION_SPEC_2007_02_NS_URI))
     {
         return AXIS2_TRUE;
     }
+
     return AXIS2_FALSE;
 }
 

Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/wsrm/rm_elements.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/wsrm/rm_elements.c?rev=689747&r1=689746&r2=689747&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/wsrm/rm_elements.c
(original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/wsrm/rm_elements.c
Thu Aug 28 00:41:10 2008
@@ -562,25 +562,49 @@
     {
         axutil_array_list_t *headers = NULL;
         
-        headers = axiom_soap_header_get_header_blocks_with_namespace_uri(
-            soap_header, env, SANDESHA2_SPEC_2005_02_NS_URI);
+        headers = axiom_soap_header_get_header_blocks_with_namespace_uri(soap_header, env,

+                SANDESHA2_SPEC_2005_02_NS_URI);
         if(headers && 0 < axutil_array_list_size(headers, env))
         {
             if(headers)
+            {
                 axutil_array_list_free(headers, env);
+            }
+
             return SANDESHA2_SPEC_2005_02_NS_URI;
         }
-        headers = axiom_soap_header_get_header_blocks_with_namespace_uri(
-            soap_header, env, SANDESHA2_SPEC_2007_02_NS_URI);                
+
+        headers = axiom_soap_header_get_header_blocks_with_namespace_uri(soap_header, env,

+                SANDESHA2_SPEC_2007_02_NS_URI);
+
         if(headers && 0 < axutil_array_list_size(headers, env))
         {
             if(headers)
+            {
                 axutil_array_list_free(headers, env);
+            }
+
             return SANDESHA2_SPEC_2007_02_NS_URI;
         }
+        
+        headers = axiom_soap_header_get_header_blocks_with_namespace_uri(soap_header, env,

+                MAKE_CONNECTION_SPEC_2007_02_NS_URI);
+
+        if(headers && 0 < axutil_array_list_size(headers, env))
+        {
+            if(headers)
+            {
+                axutil_array_list_free(headers, env);
+            }
+
+            return MAKE_CONNECTION_SPEC_2007_02_NS_URI;
+        }
     }
+
     if(!action)
+    {
         return NULL;
+    }
     
     if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ))
         return SANDESHA2_SPEC_2005_02_NS_URI;
@@ -605,8 +629,11 @@
         return SANDESHA2_SPEC_2007_02_NS_URI;
     if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2007_02_ACTION_CLOSE_SEQ_RESPONSE))
         return SANDESHA2_SPEC_2007_02_NS_URI;
-    if(0 == axutil_strcmp(action, SANDESHA2_SPEC_2007_02_ACTION_MAKE_CONNECTION))
-        return SANDESHA2_SPEC_2007_02_NS_URI;
+
+    if(!axutil_strcmp(action, SANDESHA2_SPEC_2007_02_ACTION_MAKE_CONNECTION))
+    {
+        return MAKE_CONNECTION_SPEC_2007_02_NS_URI;
+    }
     
     return NULL;
     



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org


Mime
View raw message