You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2002/03/23 18:23:16 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_env.c jk_logger_file.c
costin 02/03/23 09:23:15
Modified: jk/native2/common jk_env.c jk_logger_file.c
Log:
Added support for saving unparsed property values
Make the parse_log_level 'public' - not nice, but the apache2 logger needs
to parse it as well. Yes, inheritance and 'protected' are usefull.
Revision Changes Path
1.13 +2 -1 jakarta-tomcat-connectors/jk/native2/common/jk_env.c
Index: jk_env.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_env.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_env.c 20 Mar 2002 23:44:37 -0000 1.12
+++ jk_env.c 23 Mar 2002 17:23:15 -0000 1.13
@@ -107,7 +107,7 @@
{
jk_env_objectFactory_t fac;
jk_bean_t *result;
-
+
if( type==NULL ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"env.createInstance(): NullPointerException\n");
@@ -133,6 +133,7 @@
result=(jk_bean_t *)pool->calloc( NULL, pool, sizeof( jk_bean_t ));
result->type=type;
result->name=name;
+ result->settings=NULL;
fac( env, pool, result, type, name );
if( result->object==NULL ) {
1.15 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c
Index: jk_logger_file.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_logger_file.c 20 Mar 2002 23:44:37 -0000 1.14
+++ jk_logger_file.c 23 Mar 2002 17:23:15 -0000 1.15
@@ -59,7 +59,7 @@
* Description: Utility functions (mainly configuration) *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Author: Henri Gomez <hg...@slib.fr> *
- * Version: $Revision: 1.14 $ *
+ * Version: $Revision: 1.15 $ *
***************************************************************************/
#include "jk_env.h"
@@ -123,7 +123,7 @@
return JK_FALSE;
}
-static int jk2_logger_file_parseLogLevel(jk_env_t *env, const char *level)
+int jk2_logger_file_parseLogLevel(jk_env_t *env, const char *level)
{
if( level == NULL ) return JK_LOG_ERROR_LEVEL;
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>