Author: mturk
Date: Mon Feb 8 07:22:04 2010
New Revision: 907567
URL: http://svn.apache.org/viewvc?rev=907567&view=rev
Log:
Fix JVM core on Library.terminate
Modified:
tomcat/native/branches/1.1.x/native/src/network.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
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=907567&r1=907566&r2=907567&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/network.c (original)
+++ tomcat/native/branches/1.1.x/native/src/network.c Mon Feb 8 07:22:04 2010
@@ -76,6 +76,7 @@
#endif /* TCN_DO_STATISTICS */
+extern apr_pool_t *tcn_global_pool;
static apr_status_t sp_socket_cleanup(void *data)
{
tcn_socket_t *s = (tcn_socket_t *)data;
@@ -409,7 +410,7 @@
}
return P2J(a);
cleanup:
- if (p && s->sock)
+ if (tcn_global_pool && p && s->sock)
apr_pool_destroy(p);
return 0;
}
Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=907567&r1=907566&r2=907567&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Mon Feb 8
07:22:04 2010
@@ -36,6 +36,13 @@
new documentation project for Tomcat Native was started.
</p>
</section>
+<section name="Changes between 1.1.19 and 1.1.20">
+ <changelog>
+ <fix>
+ Prevent crashing JVM on shutdown. (mturk)
+ </fix>
+ </changelog>
+</section>
<section name="Changes between 1.1.18 and 1.1.19">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
