diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2005-06-16 20:35:08 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2005-06-16 20:35:08 +0000 |
| commit | 672e6e79072df56cee5096bd8de7253b1045a9a0 (patch) | |
| tree | 4984bb8586cd05ef4828084f21be0b277892e4df | |
| parent | b3e4bb41f538bea38ae773858392771858c39fc1 (diff) | |
| download | ATCD-672e6e79072df56cee5096bd8de7253b1045a9a0.tar.gz | |
ChangeLogTag:Thu Jun 16 07:38:57 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ace/OS_NS_sys_socket.inl | 4 | ||||
| -rw-r--r-- | ace/SOCK_Stream.cpp | 10 |
3 files changed, 7 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index 0d823ccf2ed..21315e133de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ Thu Jun 16 07:38:57 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu> + * ace/SOCK_Stream.cpp (close): Removed the call to this->close_writer() + since that functionality was done by ACE_SOCK::close(), which + delegates to ACE_OS::closesocket(), which handles this + automatically. + * ace/Process.cpp (running): Only try to "kill" a process if the PID is valid. Thanks to Howard Finer <hfiner at sonusnet dot com> for contributing this. diff --git a/ace/OS_NS_sys_socket.inl b/ace/OS_NS_sys_socket.inl index 5e39f4f2f85..e60d3894a0b 100644 --- a/ace/OS_NS_sys_socket.inl +++ b/ace/OS_NS_sys_socket.inl @@ -131,8 +131,8 @@ ACE_OS::closesocket (ACE_HANDLE handle) #else # if defined (HPUX) // HP-UX, at least with current BSD socket semantics, will not abort - // an in-progress operation on a socket that is close()ed. But it will - // for one that is shutdown()ed. + // an in-progress operation on a socket that is close()ed. But it + // will for one that is shutdown()ed. ACE_OS::shutdown (handle, SHUT_RDWR); # endif /* HPUX */ ACE_OSCALL_RETURN (::close (handle), int, -1); diff --git a/ace/SOCK_Stream.cpp b/ace/SOCK_Stream.cpp index b207cbf8b83..ea794662356 100644 --- a/ace/SOCK_Stream.cpp +++ b/ace/SOCK_Stream.cpp @@ -22,16 +22,6 @@ ACE_SOCK_Stream::dump (void) const int ACE_SOCK_Stream::close (void) { -#if defined (ACE_WIN32) - // We need the following call to make things work correctly on - // Win32, which requires use to do a <close_writer> before doing the - // close in order to avoid losing data. Note that we don't need to - // do this on UNIX since it doesn't have this "feature". Moreover, - // this will cause subtle problems on UNIX due to the way that - // fork() works. - this->close_writer (); -#endif /* ACE_WIN32 */ - // Close down the socket. return ACE_SOCK::close (); } |