You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2005/07/02 13:03:24 UTC
cvs commit: jakarta-tomcat-connectors/jni/native/src network.c
mturk 2005/07/02 04:03:24
Modified: jni/native/src network.c
Log:
Do not set net-> members to NULL.
Revision Changes Path
1.43 +5 -5 jakarta-tomcat-connectors/jni/native/src/network.c
Index: network.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/network.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- network.c 2 Jul 2005 07:19:10 -0000 1.42
+++ network.c 2 Jul 2005 11:03:24 -0000 1.43
@@ -179,10 +179,8 @@
{
tcn_socket_t *s = (tcn_socket_t *)data;
- if (s->net->cleanup) {
+ if (s->net && s->net->cleanup)
(*s->net->cleanup)(s->opaque);
- s->net->cleanup = NULL;
- }
if (s->sock) {
apr_socket_close(s->sock);
s->sock = NULL;
@@ -367,8 +365,10 @@
#ifdef TCN_DO_STATISTICS
apr_atomic_inc32(&sp_closed);
#endif
- if (s->net->close)
+ if (s->net && s->net->close) {
rv = (*s->net->close)(s->opaque);
+ s->net = NULL;
+ }
if (s->sock) {
rv = (jint)apr_socket_close(s->sock);
s->sock = NULL;
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
Re: cvs commit: jakarta-tomcat-connectors/jni/native/src network.c
Posted by Natasha Hasmani <nh...@eatertainment.com>.
Thank-you for your e-mail.
Please note that i will be away from the office starting Wednesday June
29th, returning Thursday July 7th, with no access to email. In my absence,
kindly contact Cheri Dueck at cdueck@eatertainment.com
Kind Regards,
Natasha Hasmani
Senior Event Manager
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org