svn commit: r598405 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

[rjung]

Author: rjung
Date: Mon Nov 26 12:01:28 2007
New Revision: 598405

URL: http://svn.apache.org/viewvc?rev=598405&view=rev
Log:
Fix missing init of jk_worker_properties.
Bug introduced in r580793.

Modified:
    tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
    tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=598405&r1=598404&r2=598405&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Mon Nov 26 12:01:28 
2007
@@ -1911,6 +1911,8 @@
         (jk_server_conf_t *) ap_get_module_config(s->module_config,
                                                   &jk_module);
 
+    if (!jk_worker_properties)
+        jk_map_alloc(&jk_worker_properties);
     if (jk_map_read_property(jk_worker_properties, line,
                              JK_MAP_HANDLE_DUPLICATES, conf->log) == JK_FALSE)
         return ap_pstrcat(cmd->temp_pool, "Invalid JkWorkerProperty ", line, 
NULL);
@@ -2560,7 +2562,8 @@
     jk_server_conf_t *conf =
         (jk_server_conf_t *) ap_get_module_config(s->module_config,
                                                   &jk_module);
-    jk_map_alloc(&jk_worker_properties);
+    if (!jk_worker_properties)
+        jk_map_alloc(&jk_worker_properties);
     jk_map_put(jk_worker_properties, "ServerRoot", ap_server_root, NULL);
 
     main_server = s;

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=598405&r1=598404&r2=598405&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Mon Nov 26 12:01:28 
2007
@@ -1945,6 +1945,8 @@
         return err_string;
     }
 
+    if (!jk_worker_properties)
+        jk_map_alloc(&jk_worker_properties);
     if (jk_map_read_property(jk_worker_properties, line,
                              JK_MAP_HANDLE_DUPLICATES, conf->log) == JK_FALSE)
         return apr_pstrcat(cmd->temp_pool, "Invalid JkWorkerProperty ", line, 
NULL);
@@ -2757,7 +2759,8 @@
     int is_threaded;
     int mpm_threads = 1;
 
-    jk_map_alloc(&jk_worker_properties);
+    if (!jk_worker_properties)
+        jk_map_alloc(&jk_worker_properties);
     jk_map_put(jk_worker_properties, "ServerRoot", ap_server_root, NULL);
 
 #if !defined(WIN32) && !defined(NETWARE)



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]