summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2001-05-08 15:06:04 +0000
committerbala <balanatarajan@users.noreply.github.com>2001-05-08 15:06:04 +0000
commit3e62af49868aa617b78e6ffbfeb2d80c6702dbc3 (patch)
tree76204e5286c2fc1f09f348f373e5eb249400fc02
parenta517b089897b7adde781dd7de46f5efee4e96f23 (diff)
downloadATCD-3e62af49868aa617b78e6ffbfeb2d80c6702dbc3.tar.gz
ChangeLogTag: Tue May 8 10:02:47 2001 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a7
-rw-r--r--TAO/tao/ORB_Core.cpp2
2 files changed, 7 insertions, 2 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 78779fe1ba1..b7f9cb5c816 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Tue May 8 10:02:47 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * tao/ORB_Core.cpp: Reverted this change "Tue May 8 07:32:15 2001
+ Balachandran Natarajan". The problem on Linux builds seems to be
+ a manifestation from the problem that was fixed in this change
+ "Tue May 8 09:01:13 2001 Balachandran Natarajan".
+
Tue May 8 09:01:13 2001 Balachandran Natarajan <bala@cs.wustl.edu>
* tao/Object_Ref_Table.cpp (~TAO_Object_Ref_Table): Removed a
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index d9d8306d884..0be0aa77534 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1213,9 +1213,7 @@ TAO_ORB_Core::fini (void)
(*eh)->handle_close (ACE_INVALID_HANDLE,
ACE_Event_Handler::ALL_EVENTS_MASK);
}
- unregistered.reset ();
}
-
// Pass reactor back to the resource factory.
if (this->resource_factory_ != 0)
this->resource_factory_->reclaim_reactor (this->reactor_);