axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r376199 - in /webservices/axis2/trunk/c/modules: core/deployment/conf_init.c core/phaseresolver/phase_resolver.c mod_addr/addr_in_handler.c
Date Thu, 09 Feb 2006 06:05:07 GMT
Author: samisa
Date: Wed Feb  8 22:05:04 2006
New Revision: 376199

URL: http://svn.apache.org/viewcvs?rev=376199&view=rev
Log:
Fixed some more bugs related to module loading

Modified:
    webservices/axis2/trunk/c/modules/core/deployment/conf_init.c
    webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
    webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c

Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_init.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/conf_init.c?rev=376199&r1=376198&r2=376199&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_init.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_init.c Wed Feb  8 22:05:04 2006
@@ -77,7 +77,6 @@
     }
     
     conf = AXIS2_DEP_ENGINE_LOAD_CLIENT(dep_engine, env, axis2_home);
-    AXIS2_DEP_ENGINE_FREE(dep_engine, env);
     if (!conf)
     {
         return NULL;
@@ -126,8 +125,13 @@
                 axis2_hash_this (hi, NULL, NULL, &module);
                 if (module)
                 {
-                    axis2_module_t *mod = (axis2_module_t*)module;
-                    AXIS2_MODULE_INIT(mod, env, conf);
+                    axis2_module_desc_t *mod_desc = (axis2_module_desc_t*)module;
+                    if (mod_desc)
+                    {
+                        axis2_module_t *mod = AXIS2_MODULE_DESC_GET_MODULE(mod_desc, env);
+                        if (mod)
+                            AXIS2_MODULE_INIT(mod, env, conf);
+                    }
                 }
             }
         }

Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?rev=376199&r1=376198&r2=376199&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Wed Feb  8 22:05:04
2006
@@ -347,7 +347,7 @@
     /********************* Handlers from   axis2.xml from modules *************/
     /**************************************************************************/
     
-    moduleqnames = (axis2_array_list_t *) AXIS2_CONF_GET_ENGAGED_MODULES(
+    moduleqnames = AXIS2_CONF_GET_ENGAGED_MODULES(
         resolver_impl->axis2_config, env);
     
     size = AXIS2_ARRAY_LIST_SIZE(moduleqnames, env);

Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c?rev=376199&r1=376198&r2=376199&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Wed Feb  8 22:05:04 2006
@@ -207,7 +207,7 @@
         }
     }
     
-    return AXIS2_FAILURE;
+    return AXIS2_SUCCESS;
 }
 
 axis2_status_t 



Mime
View raw message