diff options
-rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp | 17 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/UDP.cpp | 5 |
3 files changed, 12 insertions, 17 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 89fd08909d1..e530d9c0488 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Fri Nov 16 13:36:09 2001 Craig Rodrigues <crodrigu@bbn.com> + + * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp: Removed deletes from + destructor. Was causing Multicast and Pluggable tests to crash. + * orbsvcs/orbsvcs/AV/UDP.cpp (open_i): Added a check of the + result variable to remove a KAI C++ warning. + Thu Nov 15 17:54:41 2001 Craig Rodrigues <crodrigu@bbn.com> * orbsvcs/orbsvcs/AV/RTCP_Channel.h: diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index ca4f611372d..a75c69b9170 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -116,23 +116,6 @@ TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (const char *flowname, // Destructor. TAO_FlowSpec_Entry::~TAO_FlowSpec_Entry (void) { - if (this->address_) - delete this->address_; - - if (this->control_address_) - delete this->control_address_; - - if (this->protocol_object_) - delete this->protocol_object_; - - if (this->control_protocol_object_) - delete this->control_protocol_object_; - - if (this->handler_) - delete this->handler_; - - if (this->control_handler_) - delete this->control_handler_; } diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index 0e53d7ce491..5e4e869921f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -430,6 +430,11 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr, this->entry_->is_multicast (), TAO_AV_UDP_Connection_Setup::ACCEPTOR); + if( result < 0) + { + ACE_DEBUG((LM_DEBUG,"(%N,%l) Error during connection setup: %d\n", result)); + } + local_addr->set (local_addr->get_port_number (), local_addr->get_host_name ()); |