costin 2002/06/10 19:51:18
Modified: jk/native2/common jk_env.c jk_logger_file.c
jk_mutex_thread.c
jk/native2/jni jk_jni_aprImpl.c
Log:
Fix initialization problem for libjkjni.so
Revision Changes Path
1.36 +3 -3 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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- jk_env.c 10 Jun 2002 21:55:06 -0000 1.35
+++ jk_env.c 11 Jun 2002 02:51:18 -0000 1.36
@@ -63,7 +63,7 @@
#endif
jk_env_t *jk_env_globalEnv;
-void *jkGlobalAprPool;
+void *jkGlobalAprPool=NULL;
/* Private methods
*/
@@ -82,7 +82,7 @@
*/
if( jkGlobalAprPool==NULL ) {
int rc;
-
+
rc = apr_pool_create(( apr_pool_t **)&jkGlobalAprPool, NULL);
if (rc != APR_SUCCESS || jkGlobalAprPool==NULL ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
@@ -96,7 +96,7 @@
#endif
}
-static void JK_METHOD jk2_env_setAprPool( jk_env_t *env, void *aprPool ) {
+void JK_METHOD jk2_env_setAprPool( jk_env_t *env, void *aprPool ) {
jkGlobalAprPool=aprPool;
}
1.31 +5 -5 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jk_logger_file.c 10 Jun 2002 23:58:52 -0000 1.30
+++ jk_logger_file.c 11 Jun 2002 02:51:18 -0000 1.31
@@ -111,7 +111,7 @@
if( f==NULL ) {
/* This is usefull to debug what happens before logger is set.
On apache you need -X option ( no detach, single process ) */
- fprintf(stderr, "JK_LOG: %s", what );
+ if( what != NULL ) fprintf(stderr, what );
return JK_OK;
}
if(l && l->level <= level && l->logger_private && what) {
@@ -261,9 +261,9 @@
f++;
}
- /* XXX or apr_ctime ? */
- apr_rfc822_date( rfctime, time );
- fmt1=apr_psprintf( aprPool, "[%s] (%5s) [%s (%d)] %s", rfctime, slevel, f,
line, fmt );
+ /* XXX rfc822_date or apr_ctime ? */
+ apr_ctime( rfctime, time );
+ fmt1=apr_psprintf( aprPool, "[%s] (%5s ) [%s (%d)] %s", rfctime, slevel,
f, line, fmt );
buf=apr_pvsprintf( aprPool, fmt1, args );
l->log(env, l, level, buf);
1.5 +3 -0 jakarta-tomcat-connectors/jk/native2/common/jk_mutex_thread.c
Index: jk_mutex_thread.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_mutex_thread.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_mutex_thread.c 10 Jun 2002 21:55:06 -0000 1.4
+++ jk_mutex_thread.c 11 Jun 2002 02:51:18 -0000 1.5
@@ -98,18 +98,21 @@
static int JK_METHOD
jk2_mutex_thread_lock(jk_env_t *env, jk_mutex_t *jkMutex)
{
+ if( jkMutex==NULL || jkMutex->threadMutex==NULL ) return JK_ERR;
return apr_thread_mutex_lock( jkMutex->threadMutex );
}
static int JK_METHOD
jk2_mutex_thread_tryLock(jk_env_t *env, jk_mutex_t *jkMutex)
{
+ if( jkMutex==NULL || jkMutex->threadMutex==NULL ) return JK_ERR;
return apr_thread_mutex_trylock( jkMutex->threadMutex );
}
static int JK_METHOD
jk2_mutex_thread_unLock(jk_env_t *env, jk_mutex_t *jkMutex)
{
+ if( jkMutex==NULL || jkMutex->threadMutex==NULL ) return JK_ERR;
return apr_thread_mutex_unlock( jkMutex->threadMutex );
}
1.36 +5 -1 jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c
Index: jk_jni_aprImpl.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- jk_jni_aprImpl.c 11 Jun 2002 00:01:16 -0000 1.35
+++ jk_jni_aprImpl.c 11 Jun 2002 02:51:18 -0000 1.36
@@ -113,6 +113,7 @@
#define JK_DIRECT_BUFFER_NIO 3
static int arrayAccessMethod=JK_GET_REGION;
+void JK_METHOD jk2_env_setAprPool( jk_env_t *env, void *aprPool );
JNIEXPORT void JNICALL
Java_org_apache_jk_apr_AprImpl_setArrayAccessMode(JNIEnv *jniEnv, jobject _jthis,
jint mode)
@@ -137,10 +138,12 @@
if( jniAprPool==NULL ) {
return JK_ERR;
}
+
+ jk2_env_setAprPool( NULL, jniAprPool );
+
jk2_pool_apr_create( NULL, &globalPool, NULL, jniAprPool );
/* Create the global env */
env=jk2_env_getEnv( NULL, globalPool );
- env->setAprPool(env, globalPool);
}
env=jk_env_globalEnv;
@@ -168,6 +171,7 @@
}
workerEnv=jkb->object;
+
workerEnv->init( env, workerEnv );
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
