summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-11-16 19:22:55 +0000
committercrodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-11-16 19:22:55 +0000
commitc069fcda28923f605bf3bc7bbbdb631834547047 (patch)
treedefd130f0ecd8f0d82c5b7af02279a7a50a18433
parente480d2297034b2d58e652df835e744c6a7cb4586 (diff)
downloadATCD-c069fcda28923f605bf3bc7bbbdb631834547047.tar.gz
ChangeLogTag: Fri Nov 16 13:36:09 2001 Craig Rodrigues <crodrigu@bbn.com>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a7
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp17
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/UDP.cpp5
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 ());