tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hgo...@apache.org
Subject svn commit: r531985 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Date Tue, 24 Apr 2007 15:31:32 GMT
Author: hgomez
Date: Tue Apr 24 08:31:31 2007
New Revision: 531985

URL: http://svn.apache.org/viewvc?view=rev&rev=531985
Log:
Rainer fixes for log reinit. i5/OS V5R4 now works

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=531985&r1=531984&r2=531985
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Tue Apr 24 08:31:31 2007
@@ -2545,10 +2545,6 @@
 static apr_status_t jklog_cleanup(void *d)
 {
     /* set the main_log to NULL */
-#ifdef AS400
-	main_log = null;
-#endif
-
     d = NULL;
     return APR_SUCCESS;
 }
@@ -2621,9 +2617,11 @@
         jkl->logger_private = flp;
         flp->jklogfp = conf->jklogfp;
         conf->log = jkl;
-        if (main_log == NULL)
+        if (main_log == NULL) {
             main_log = conf->log;
-        apr_pool_cleanup_register(p, conf->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


Mime
View raw message