mturk 2004/03/15 12:09:30
Modified: jk/native2/common jk_shm.c
Log:
Supress duplicate initialization for shm, that causes duplicate shm initialization.
There is also unneded call to shm->init inside the workerEnv->parentInit,
since it is caled after workerEnv->init, but now it doesn't mater.
Revision Changes Path
1.43 +6 -0 jakarta-tomcat-connectors/jk/native2/common/jk_shm.c
Index: jk_shm.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- jk_shm.c 13 Mar 2004 08:47:31 -0000 1.42
+++ jk_shm.c 15 Mar 2004 20:09:30 -0000 1.43
@@ -141,6 +141,12 @@
int rv=JK_OK;
+ /* In case the shm has been initialized already
+ * for the current process.
+ */
+ if (shm->head && shm->image)
+ return rv;
+
shm->privateData = NULL;
if (shm->fname == NULL) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
