tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r534003 - /tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
Date Tue, 01 May 2007 10:55:14 GMT
Author: rjung
Date: Tue May  1 03:55:14 2007
New Revision: 534003

URL: http://svn.apache.org/viewvc?view=rev&rev=534003
Log:
Changing init order for nsapi plugin maps.
Otherwise using mount attribute inside workers.properties
will crash during startup.

Modified:
    tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c

Modified: tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c?view=diff&rev=534003&r1=534002&r2=534003
==============================================================================
--- tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c Tue May  1 03:55:14 2007
@@ -90,11 +90,11 @@
     init_map = (jk_map_t *)init_d;
     /* we add the URI->WORKER MAP since workers using AJP14 will feed it */
     /* but where are they here in Netscape ? */
-    if (wc_open(init_map, &worker_env, logger)) {
-        if (uri_worker_map_alloc(&uw_map, NULL, logger)) {
-            uw_map->fname = "";
-            uw_map->reload = JK_URIMAP_DEF_RELOAD;
-            worker_env.uri_to_worker = uw_map;
+    if (uri_worker_map_alloc(&uw_map, NULL, logger)) {
+        uw_map->fname = "";
+        uw_map->reload = JK_URIMAP_DEF_RELOAD;
+        worker_env.uri_to_worker = uw_map;
+        if (wc_open(init_map, &worker_env, logger)) {
             init_on_other_thread_is_ok = JK_TRUE;
         }
         else {



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


Mime
View raw message