[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wsf-c-commits
Subject:    [Wsf-c-commits] svn commit r19869 - trunk/wsf/php/src
From:       nandika () wso2 ! com
Date:       2008-07-22 12:25:39
Message-ID: E1KLGvz-0000UT-0w () wso2 ! org
[Download RAW message or body]

Author: nandika
Date: Tue Jul 22 05:25:38 2008
New Revision: 19869
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=19869

Log:
inconsistency issue in secconv fixed

Modified:
   trunk/wsf/php/src/wsf.c
   trunk/wsf/php/src/wsf_util.c

Modified: trunk/wsf/php/src/wsf.c
URL: http://wso2.org/svn/browse/wso2/trunk/wsf/php/src/wsf.c?rev=19869&r1=19868&r2=19869&view=diff
 ==============================================================================
--- trunk/wsf/php/src/wsf.c	(original)
+++ trunk/wsf/php/src/wsf.c	Tue Jul 22 05:25:38 2008
@@ -1112,13 +1112,12 @@
 		wsf_util_process_ws_service_classes(ht_classes, ht_ops_to_mep,svc_info, ws_env_svr \
TSRMLS_CC);  }
 
-    wsf_util_process_ws_service_op_actions(ht_actions, svc_info, ws_env_svr \
                TSRMLS_CC);
- 
 	wsf_util_add_svc_to_conf(ws_env_svr, svc_info, wsf_worker_get_conf_ctx(worker, \
ws_env_svr));  
-
     wsf_util_engage_modules_to_svc(ws_env_svr, wsf_worker_get_conf_ctx(worker, \
ws_env_svr), svc_info);  
+	wsf_util_process_ws_service_op_actions(ht_actions, svc_info, ws_env_svr TSRMLS_CC);
+
 	wsf_util_process_rest_params(ws_env_svr, svc_info, ht_rest_map TSRMLS_CC);
 
     /*if(zend_hash_find(Z_OBJPROP_P(this_ptr), WSF_WSDL,

Modified: trunk/wsf/php/src/wsf_util.c
URL: http://wso2.org/svn/browse/wso2/trunk/wsf/php/src/wsf_util.c?rev=19869&r1=19868&r2=19869&view=diff
 ==============================================================================
--- trunk/wsf/php/src/wsf_util.c	(original)
+++ trunk/wsf/php/src/wsf_util.c	Tue Jul 22 05:25:38 2008
@@ -570,16 +570,19 @@
 
     mod_qname = axutil_qname_create (env, module_name, NULL, NULL);
     module = axis2_conf_get_module (conf, env, mod_qname);
-    if (module) {
+    if (module) 
+	{
         status = axis2_svc_engage_module (svc, env, module, conf);
 		AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, WSF_PHP_LOG_PREFIX \
 			"Engaging module %s to service ", module_name);
-        if (!status) {
+        if (!status) 
+		{
             phase_resolver =
                 axis2_phase_resolver_create_with_config (env, conf);
-            if (!phase_resolver) {
+            if (!phase_resolver) 
+			{
                 AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, WSF_PHP_LOG_PREFIX \
-                    "Enaging module, PHASE RESLOVER NULL");
+                    "Engaging module, PHASE RESLOVER NULL");
                 return AXIS2_FAILURE;
             }
             status =
@@ -590,7 +593,7 @@
     return status;
 }
 
-/* genarate service name from uri */
+/* generate service name from uri */
 char *
 wsf_util_generate_svc_name_from_uri_and_set_loc_str (
     char *req_uri,
@@ -752,9 +755,7 @@
     char *op_name TSRMLS_DC)
 {
     axis2_op_t *op = NULL;
-    axutil_qname_t *op_qname = NULL;
-    op_qname = axutil_qname_create (env, op_name, NULL, NULL);
-
+    
     if (NULL != svc_info->svc && NULL != op_name) {
         op = axis2_svc_get_op_with_name (svc_info->svc, env, op_name);
         if (!op) {
@@ -766,9 +767,6 @@
                 axis2_svc_add_mapping (svc_info->svc, env, action, op);
        }
     }
-    if(op_qname){
-        axutil_qname_free(op_qname, env);
-    }
     return;
 }
 
@@ -1595,7 +1593,7 @@
         function_name = emalloc (key_len + 1);
         zend_str_tolower_copy (function_name, func_name, key_len);
 
-        if (zend_hash_find (EG (function_table), function_name, key_len + 1, (void \
**) &f) == FAILURE)  +		if (zend_hash_find (EG (function_table), function_name, \
key_len + 1, (void **) &f) == FAILURE)   {
             efree(function_name);
             php_error_docref (NULL TSRMLS_CC, E_ERROR, "Named function not in \
function table"); @@ -1609,7 +1607,7 @@
 
      	    wsf_util_create_op_and_add_to_svc (svc_info, ws_env_svr,
                 op_name_to_store, ht_ops_to_mep TSRMLS_CC);
-		}
+		 } 
         zend_hash_move_forward_ex (ht_ops_to_funcs, &pos);
         i++;
     }
@@ -1668,18 +1666,21 @@
             key = emalloc (key_len + 1);
 
             zend_str_tolower_copy (key, operation_name , key_len);
-
+			
             if (zend_hash_find (EG (function_table), key, key_len + 1, (void **) &f) \
== FAILURE)  {
-                /* php_error_docref (NULL TSRMLS_CC, E_ERROR, "Named function not in \
                function table"); */
                 AXIS2_LOG_DEBUG(ws_env_svr->log, AXIS2_LOG_SI, WSF_PHP_LOG_PREFIX \
 					"%s The function does not exist in function table ", operation_name);
             }
 			else
 			{
-            	axutil_hash_set (svc_info->ops_to_functions, axutil_strdup (ws_env_svr, \
Z_STRVAL_PP (tmp)), +				axutil_hash_set (svc_info->ops_to_functions, axutil_strdup \
                (ws_env_svr, Z_STRVAL_PP (tmp)),
                     AXIS2_HASH_KEY_STRING, axutil_strdup (ws_env_svr, Z_STRVAL_PP \
                (tmp)));
-			}
+				/*
+				wsf_util_create_op_and_add_to_svc (svc_info, ws_env_svr, 
+					Z_STRVAL_PP(tmp), NULL TSRMLS_CC);
+				*/
+			 } 
             efree(key);
 		}
         if (wsa_action) 

_______________________________________________
Wsf-c-commits mailing list
Wsf-c-commits@wso2.org
http://www.wso2.org/cgi-bin/mailman/listinfo/wsf-c-commits


[prev in list] [next in list] [prev in thread] [next in thread]