Author: mturk
Date: Tue Aug 24 06:36:46 2010
New Revision: 988402
URL: http://svn.apache.org/viewvc?rev=988402&view=rev
Log:
Step 1 in solving the JVM core on shutdown. Use APR pool pre-cleanup API
Modified:
tomcat/native/trunk/native/src/network.c
Modified: tomcat/native/trunk/native/src/network.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/network.c?rev=988402&r1=988401&r2=988402&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/network.c (original)
+++ tomcat/native/trunk/native/src/network.c Tue Aug 24 06:36:46 2010
@@ -196,9 +196,8 @@ TCN_IMPLEMENT_CALL(jlong, Socket, create
TCN_THROW_IF_ERR(apr_socket_create(&s,
f, t, protocol, c), a);
}
- apr_pool_cleanup_register(c, (const void *)a,
- sp_socket_cleanup,
- apr_pool_cleanup_null);
+ apr_pool_pre_cleanup_register(c, (const void *)a,
+ sp_socket_cleanup);
#ifdef TCN_DO_STATISTICS
sp_created++;
@@ -391,9 +390,8 @@ TCN_IMPLEMENT_CALL(jlong, Socket, accept
TCN_THROW_IF_ERR(apr_socket_accept(&n, s->sock, p), n);
a->pool = p;
- apr_pool_cleanup_register(a->pool, (const void *)a,
- sp_socket_cleanup,
- apr_pool_cleanup_null);
+ apr_pool_pre_cleanup_register(a->pool, (const void *)a,
+ sp_socket_cleanup);
}
else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
