summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-12-07 12:07:01 +0000
committerdhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-12-07 12:07:01 +0000
commite231db61d399c4c64b3247fc506d0bd650f7083a (patch)
tree0f6fe07e5d0c01bfd888ab9b53c8e46cf4a3cdcc
parentaa8bbc36d72dd9a059fee64a33944fc30b4fa819 (diff)
downloadATCD-e231db61d399c4c64b3247fc506d0bd650f7083a.tar.gz
ChangeLogTag:Sat Dec 7 11:59:06 UTC 2002 Don Hinton <dhinton@ieee.org>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp8
2 files changed, 7 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 49981097f5e..7c71e4f9626 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Sat Dec 7 11:59:06 UTC 2002 Don Hinton <dhinton@ieee.org>
+
+ * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp: Removed close
+ from dtor since it can raise an exception. This is
+ consistent with previous behavior since the user must
+ explicitely call close.
+
Fri Dec 6 21:02:48 UTC 2002 Don Hinton <dhinton@ieee.org>
* orbsvcs/orbsvcs/Event/ECG_Mcast_EH.{h,cpp}: Removed use of
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index 1e8934553c7..44751904ad7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -57,14 +57,6 @@ TAO_ECG_Mcast_EH::TAO_ECG_Mcast_EH (TAO_ECG_UDP_Receiver *recv,
TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH (void)
{
- ACE_TRY
- {
- if (this->handle_)
- this->close ();
- }
- ACE_CATCHALL
- ACE_ENDTRY;
-
ACE::strdelete (this->net_if_);
delete this->lock_;
}