Author: rjung
Date: Sun Sep 2 12:48:27 2007
New Revision: 572131
URL: http://svn.apache.org/viewvc?rev=572131&view=rev
Log:
Replace NULL by an empty string as a marker
for worker references that have already been
applied.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_map.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_map.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_map.c?rev=572131&r1=572130&r2=572131&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_map.c Sun Sep 2 12:48:27 2007
@@ -756,7 +756,8 @@
"Checking for references with prefix %s with%s wildcard
(recursion %d)",
prefix, wildcard? "" : "out", depth);
for (i = 0; i < m->size; i++) {
- if (m->values[i] && !strncmp(m->names[i], prefix, prelen)) {
+ if (m->values[i] && *(m->values[i]) &&
+ !strncmp(m->names[i], prefix, prelen)) {
size_t remain = strlen(m->names[i]) - prelen;
if ((remain == JK_MAP_REFERENCE_SZ ) || (wildcard &&
remain > JK_MAP_REFERENCE_SZ)) {
remain = strlen(m->names[i]) - JK_MAP_REFERENCE_SZ;
@@ -792,7 +793,7 @@
if (rc == JK_FALSE) {
break;
}
- m->values[i] = NULL;
+ *(m->values[i]) = '\0';
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
