cvs commit: jakarta-tomcat-connectors/jni/native/src network.c

[mturk]

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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]