Author: mturk
Date: Thu Mar 15 04:22:12 2007
New Revision: 518585
URL: http://svn.apache.org/viewvc?view=rev&rev=518585
Log:
Fix typo, and unlink on parent close.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_shm.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_shm.c?view=diff&rev=518585&r1=518584&r2=518585
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_shm.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.c Thu Mar 15 04:22:12 2007
@@ -237,7 +237,7 @@
if (!jk_shmem.lockname) {
int i;
jk_shmem.fd_lock = -1;
- for (i = 0; i < 8) {
+ for (i = 0; i < 8; i++) {
strcpy(flkname, "/tmp/jkshmlock.XXXXXX");
if (mktemp(flkname)) {
jk_shmem.fd_lock = open(flkname, O_RDWR|O_CREAT|O_TRUNC, 0666);
@@ -251,7 +251,6 @@
return rc;
}
jk_shmem.lockname = strdup(flkname);
- unlink(jk_shmem.lockname);
}
else if (attached) {
jk_shmem.fd_lock = open(jk_shmem.lockname, O_RDWR, 0666);
@@ -460,6 +459,7 @@
munmap((void *)jk_shmem.hdr, jk_shmem.size);
close(jk_shmem.fd);
if (jk_shmem.lockname) {
+ unlink(jk_shmem.lockname);
free(jk_shmem.lockname);
jk_shmem.lockname = NULL;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
