Author: rjung
Date: Sat May 23 10:05:53 2015
New Revision: 1681308
URL: http://svn.apache.org/r1681308
Log:
Don't destroy pools explicitly if we are inside apr_terminate call
Backport of r992208 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/network.c
tomcat/native/branches/1.1.x/native/src/pool.c
Propchange: tomcat/native/branches/1.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 23 10:05:53 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496
+/tomcat/native/trunk:815411,992208,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/src/network.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/network.c?rev=1681308&r1=1681307&r2=1681308&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/network.c (original)
+++ tomcat/native/branches/1.1.x/native/src/network.c Sat May 23 10:05:53 2015
@@ -222,6 +222,11 @@ TCN_IMPLEMENT_CALL(void, Socket, destroy
UNREFERENCED_STDARGS;
TCN_ASSERT(sock != 0);
+ if (!tcn_global_pool) {
+ /* Socket will be destroyed by the cleanup
+ */
+ return;
+ }
as = s->sock;
s->sock = NULL;
apr_pool_cleanup_kill(s->pool, s, sp_socket_cleanup);
Modified: tomcat/native/branches/1.1.x/native/src/pool.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/pool.c?rev=1681308&r1=1681307&r2=1681308&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/pool.c (original)
+++ tomcat/native/branches/1.1.x/native/src/pool.c Sat May 23 10:05:53 2015
@@ -69,7 +69,8 @@ TCN_IMPLEMENT_CALL(void, Pool, destroy)(
apr_pool_t *p = J2P(pool, apr_pool_t *);
UNREFERENCED_STDARGS;
TCN_ASSERT(pool != 0);
- apr_pool_destroy(p);
+ if (tcn_global_pool)
+ apr_pool_destroy(p);
}
TCN_IMPLEMENT_CALL(jlong, Pool, parentGet)(TCN_STDARGS, jlong pool)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
