tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r591796 - /tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
Date Sun, 04 Nov 2007 16:11:05 GMT
Author: rjung
Date: Sun Nov  4 08:11:04 2007
New Revision: 591796

URL: http://svn.apache.org/viewvc?rev=591796&view=rev
Log:
Cleanup logic flow and don't log NULL value ...

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=591796&r1=591795&r2=591796&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 Nov  4 08:11:04 2007
@@ -684,17 +684,17 @@
 /* In case we found a match, check for the unmounts. */
     if (rv && uw_map->nosize) {
 /* Again first including vhost. */
-        if (is_nomatch(uw_map, url, rv, l)) {
-            rv = NULL;
-        }
+        int rc = is_nomatch(uw_map, url, rv, l);
 /* If no unmount was find, try without vhost. */
-        else if (vhost_len && is_nomatch(uw_map, &url[vhost_len], rv, l)) {
-            rv = NULL;
-        }
-        if (rv == NULL && JK_IS_DEBUG_LEVEL(l)) {
+        if (!rc && vhost_len)
+            rc = is_nomatch(uw_map, &url[vhost_len], rv, l);
+        if (rc) {
+            if (JK_IS_DEBUG_LEVEL(l)) {
                 jk_log(l, JK_LOG_DEBUG,
                        "Denying match for worker %s by nomatch rule",
                        rv);
+            }
+            rv = NULL;
         }
     }
 



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


Mime
View raw message