mturk 2003/01/23 04:18:13
Modified: jk/native2/common jk_workerEnv.c
Log:
Fix the core dumps if the shm wasn't specified or was disabled.
Currently we only checked if it was disabled, not if it failed to initialize.
Revision Changes Path
1.60 +18 -9 jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c
Index: jk_workerEnv.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- jk_workerEnv.c 21 Nov 2002 07:46:40 -0000 1.59
+++ jk_workerEnv.c 23 Jan 2003 12:18:13 -0000 1.60
@@ -316,11 +316,14 @@
configFile=wEnv->config->file;
}
- if( wEnv->shm->mbean->disabled )
- wEnv->shm=NULL;
-
- if( wEnv->shm != NULL && ! wEnv->shm->mbean->disabled ) {
- wEnv->shm->init( env, wEnv->shm );
+ if (wEnv->shm != NULL && wEnv->shm->mbean->disabled)
+ wEnv->shm = NULL;
+
+ if (wEnv->shm != NULL) {
+ /* Disable the shm if the initialization fails
+ */
+ if (wEnv->shm->init(env, wEnv->shm) == JK_ERR)
+ wEnv->shm = NULL;
}
if( wEnv->shm != NULL && wEnv->shm->head != NULL ) {
@@ -328,7 +331,7 @@
if( wEnv->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_DEBUG, "workerEnv.init() Reset shm\n"
);
}
- return JK_OK;
+ return JK_OK;
}
/** Normal child init
@@ -391,9 +394,15 @@
jk2_workerEnv_initWorkers( env, wEnv );
jk2_workerEnv_initHandlers( env, wEnv );
+
+ if (wEnv->shm != NULL && wEnv->shm->mbean->disabled)
+ wEnv->shm = NULL;
- if( wEnv->shm != NULL && ! wEnv->shm->mbean->disabled ) {
- wEnv->shm->init( env, wEnv->shm );
+ if (wEnv->shm != NULL) {
+ /* Disable the shm if the initialization fails
+ */
+ if (wEnv->shm->init(env, wEnv->shm) == JK_ERR)
+ wEnv->shm = NULL;
}
wEnv->epStat=NULL;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
