[jbossnative-commits] JBoss Native SVN: r1040 - trunk/sight/native/share.

[jbossnative-commits at lists.jboss.org]

Author: mladen.turk at jboss.com
Date: 2007-09-24 01:50:42 -0400 (Mon, 24 Sep 2007)
New Revision: 1040

Modified:
   trunk/sight/native/share/mutex.c
   trunk/sight/native/share/shm.c
Log:
Destroy objects only on explicit destroy, not on pool callback

Modified: trunk/sight/native/share/mutex.c
===================================================================
--- trunk/sight/native/share/mutex.c	2007-09-21 11:48:13 UTC (rev 1039)
+++ trunk/sight/native/share/mutex.c	2007-09-24 05:50:42 UTC (rev 1040)
@@ -31,7 +31,7 @@
 
 static void mutex_cleanup(int mode, sight_object_t *no)
 {
-    if (no && no->native) {
+    if (mode != POOL_CALLBACK && no && no->native) {
         apr_proc_mutex_destroy((apr_proc_mutex_t *)no->native);
     }
 }

Modified: trunk/sight/native/share/shm.c
===================================================================
--- trunk/sight/native/share/shm.c	2007-09-21 11:48:13 UTC (rev 1039)
+++ trunk/sight/native/share/shm.c	2007-09-24 05:50:42 UTC (rev 1040)
@@ -31,7 +31,7 @@
 
 static void shm_cleanup(int mode, sight_object_t *no)
 {
-    if (no && no->native) {
+    if (mode != POOL_CALLBACK && no && no->native) {
         if (no->opaque)
             apr_shm_detach((apr_shm_t *)no->native);
         else