Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 11820 invoked from network); 16 Sep 2006 22:14:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 16 Sep 2006 22:14:00 -0000 Received: (qmail 84279 invoked by uid 500); 16 Sep 2006 22:13:57 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 84227 invoked by uid 500); 16 Sep 2006 22:13:57 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 84216 invoked by uid 500); 16 Sep 2006 22:13:57 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 84213 invoked by uid 99); 16 Sep 2006 22:13:57 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 16 Sep 2006 15:13:57 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 16 Sep 2006 15:13:56 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id AE7771A981A; Sat, 16 Sep 2006 15:13:36 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r446962 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Date: Sat, 16 Sep 2006 22:13:36 -0000 To: tomcat-dev@jakarta.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060916221336.AE7771A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: rjung Date: Sat Sep 16 15:13:30 2006 New Revision: 446962 URL: http://svn.apache.org/viewvc?view=rev&rev=446962 Log: Avoid compiler warning, keep code the same in Apache 1.3 and 2.0. Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c 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?view=diff&rev=446962&r1=446961&r2=446962 ============================================================================== --- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original) +++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sat Sep 16 15:13:30 2006 @@ -1880,7 +1880,8 @@ translate and sets the handler directly ). We still need to know the worker. */ - if (worker_name = apr_table_get(r->subprocess_env, xconf->worker_indicator)) { + worker_name = apr_table_get(r->subprocess_env, xconf->worker_indicator); + if (worker_name) { /* The JkWorkerIndicator environment variable has * been used to explicitely set the worker without JkMount. * This is useful in combination with LocationMatch or mod_rewrite. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org