From e76d9cb537c4ce7ee2363203b23315ef7392cfec Mon Sep 17 00:00:00 2001 From: elliott_c Date: Wed, 30 Apr 2008 14:26:22 +0000 Subject: ChangeLogTag: Wed Apr 30 14:28:52 UTC 2008 tao/ --- TAO/ATDChangeLog | 6 ++++++ TAO/tao/Connection_Handler.cpp | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/TAO/ATDChangeLog b/TAO/ATDChangeLog index 2ff2934da42..cd529cd8441 100644 --- a/TAO/ATDChangeLog +++ b/TAO/ATDChangeLog @@ -1,3 +1,9 @@ +Wed Apr 30 14:28:52 UTC 2008 tao/ + + * tao/Connection_Handler.cpp: + + Use the enum in checking the close value instead of a magic number. + Wed Apr 30 14:24:01 UTC 2008 Chad Elliott * tao/Transport.cpp: diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp index 08299dcdc6b..36477ce9e8e 100644 --- a/TAO/tao/Connection_Handler.cpp +++ b/TAO/tao/Connection_Handler.cpp @@ -10,6 +10,7 @@ #include "ace/SOCK.h" #include "ace/Reactor.h" #include "ace/os_include/sys/os_socket.h" +#include "ace/Svc_Handler.h" //@@ CONNECTION_HANDLER_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK @@ -442,8 +443,9 @@ TAO_Connection_Handler::close_handler (u_long flags) transport->purge_entry(); // We only need to remove the reference from the transport if there - // were connections pending at the time that the handler is closed. - if (pending || ACE_BIT_DISABLED(flags, 1)) + // were connections pending at the time that the handler is closed or + // the handler is being closed during a new connection. + if (pending || ACE_BIT_DISABLED(flags, CLOSE_DURING_NEW_CONNECTION)) transport->remove_reference (); return 0; -- cgit v1.2.1