Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 51519 invoked from network); 25 Apr 2007 08:35:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Apr 2007 08:35:15 -0000 Received: (qmail 47445 invoked by uid 500); 25 Apr 2007 08:35:17 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 47416 invoked by uid 500); 25 Apr 2007 08:35:16 -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 47405 invoked by uid 500); 25 Apr 2007 08:35:16 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 47398 invoked by uid 99); 25 Apr 2007 08:35:16 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Apr 2007 01:35:16 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Apr 2007 01:35:09 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id AC7871A9838; Wed, 25 Apr 2007 01:34:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r532254 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Date: Wed, 25 Apr 2007 08:34:48 -0000 To: tomcat-dev@jakarta.apache.org From: hgomez@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070425083448.AC7871A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hgomez Date: Wed Apr 25 01:34:47 2007 New Revision: 532254 URL: http://svn.apache.org/viewvc?view=rev&rev=532254 Log: Cleanup the pointer content (handle) 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=532254&r1=532253&r2=532254 ============================================================================== --- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original) +++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Wed Apr 25 01:34:47 2007 @@ -2544,15 +2544,11 @@ static apr_status_t jklog_cleanup(void *d) { - /* On i5/OS, Apache 2.x init stages and exec mode are done in the same thread */ - /* No fork as on Unixes, we need to cleanup some static variables */ -#ifdef AS400 - main_log = NULL; -#endif - /* hgomez@20070425 */ - /* If we pass a pointer (ie: main_log), shouldn't it be *d = NULL ? */ - d = NULL; + /* Clean up pointer content */ + if (d != NULL) + *(jk_logger_t **)d = NULL; + return APR_SUCCESS; } @@ -2630,7 +2626,7 @@ /* hgomez@20070425 */ /* Shouldn't we clean both conf->log and main_log ? */ /* Also should we pass pointer (ie: main_log) or handle (*main_log) ? */ - apr_pool_cleanup_register(p, main_log, jklog_cleanup, jklog_cleanup); + apr_pool_cleanup_register(p, &main_log, jklog_cleanup, jklog_cleanup); } return 0; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org