Author: rjung
Date: Fri Jan 18 12:03:59 2008
New Revision: 613251
URL: http://svn.apache.org/viewvc?rev=613251&view=rev
Log:
Add another JK_IS_DEBUG_LEVEL(l) and remove unneeded argument.
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=613251&r1=613250&r2=613251&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 Fri Jan 18
12:03:59 2008
@@ -292,7 +292,7 @@
*/
static int uri_worker_map_clear(jk_uri_worker_map_t *uw_map,
- unsigned int source_type, jk_logger_t *l)
+ jk_logger_t *l)
{
uri_worker_record_t *uwr = NULL;
unsigned int i;
@@ -302,10 +302,11 @@
for (i = 0; i < uw_map->size; i++) {
uwr = uw_map->maps[i];
- if (uwr->source_type == source_type) {
- jk_log(l, JK_LOG_DEBUG,
- "deleting map rule '%s=%s' source '%s'",
- uwr->context, uwr->worker_name,
uri_worker_map_get_source(uwr, l));
+ if (uwr->source_type == SOURCE_TYPE_URIMAP) {
+ if (JK_IS_DEBUG_LEVEL(l))
+ jk_log(l, JK_LOG_DEBUG,
+ "deleting map rule '%s=%s' source '%s'",
+ uwr->context, uwr->worker_name,
uri_worker_map_get_source(uwr, l));
for (j = i; j < uw_map->size-1; j++)
uw_map->maps[j] = uw_map->maps[j+1];
uw_map->size--;
@@ -723,7 +724,7 @@
jk_log(l, JK_LOG_DEBUG,
"Loading urimaps from %s with reload check interval %d
seconds",
uw_map->fname, uw_map->reload);
- uri_worker_map_clear(uw_map, SOURCE_TYPE_URIMAP, l);
+ uri_worker_map_clear(uw_map, l);
for (i = 0; i < jk_map_size(map); i++) {
const char *u = jk_map_name_at(map, i);
const char *w = jk_map_value_at(map, i);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
