tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r580780 - /tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
Date Sun, 30 Sep 2007 20:32:20 GMT
Author: rjung
Date: Sun Sep 30 13:32:19 2007
New Revision: 580780

URL: http://svn.apache.org/viewvc?rev=580780&view=rev
Log:
Move basic initialization of jk_uri_worker_map
from uri_worker_map_open() to uri_worker_map_alloc().
We don't always call uri_worker_map_open().

Modified:
    tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c?rev=580780&r1=580779&r2=580780&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Sun Sep 30 13:32:19 2007
@@ -193,6 +193,13 @@
             JK_TRACE_EXIT(l);
             return JK_FALSE;
         }
+
+        jk_open_pool(&((*uw_map)->p),
+                     (*uw_map)->buf, sizeof(jk_pool_atom_t) * BIG_POOL_SIZE);
+        (*uw_map)->size = 0;
+        (*uw_map)->capacity = 0;
+        (*uw_map)->maps = NULL;
+
         if (init_data)
             rc = uri_worker_map_open(*uw_map, init_data, l);
         JK_TRACE_EXIT(l);
@@ -406,19 +413,8 @@
 
     JK_TRACE_ENTER(l);
 
-    uw_map->size = 0;
-    uw_map->capacity = 0;
-
     if (uw_map) {
-        int sz;
-
-        rc = JK_TRUE;
-        jk_open_pool(&uw_map->p,
-                     uw_map->buf, sizeof(jk_pool_atom_t) * BIG_POOL_SIZE);
-        uw_map->size = 0;
-        uw_map->maps = NULL;
-
-        sz = jk_map_size(init_data);
+        int sz = jk_map_size(init_data);
 
         jk_log(l, JK_LOG_DEBUG,
                "rule map size is %d",



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


Mime
View raw message