svn commit: r678714 - /webservices/axis2/trunk/c/src/core/description/svc.c

[sh...@apache.org]

Author: shankar
Date: Tue Jul 22 04:06:27 2008
New Revision: 678714

URL: http://svn.apache.org/viewvc?rev=678714&view=rev
Log:
fixing conflict between service operations and module operations.

Modified:
    webservices/axis2/trunk/c/src/core/description/svc.c

Modified: webservices/axis2/trunk/c/src/core/description/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/description/svc.c?rev=678714&r1=678713&r2=678714&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/src/core/description/svc.c Tue Jul 22 04:06:27 2008
@@ -1276,8 +1276,14 @@
     AXIS2_PARAM_CHECK(env->error, mapping_key, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, op_desc, AXIS2_FAILURE);
 
-    axutil_hash_set(svc->op_action_map, axutil_strdup(env, mapping_key),
-                    AXIS2_HASH_KEY_STRING, op_desc);
+    /* If service defines the operation, then we should not override with module level 
+     * operation. Module operations are global. If any setting to be modified, those operations
+     * can be defined in service */
+    if(!axutil_hash_get(svc->op_action_map, mapping_key, AXIS2_HASH_KEY_STRING))
+    {
+        axutil_hash_set(svc->op_action_map, axutil_strdup(env, mapping_key), 
+            AXIS2_HASH_KEY_STRING, op_desc);
+    }
     return AXIS2_SUCCESS;
 }