summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-05-09 04:28:44 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-05-09 04:28:44 +0000
commitaa3e7ccc6bd3e000a161a4f56a2066f748f8fcbd (patch)
tree4443ff31fe43a77ff56be537192e8297ac30bb85
parentf4d974b7b50b45774c47cc10a9ef42c68d8a9f75 (diff)
downloadATCD-aa3e7ccc6bd3e000a161a4f56a2066f748f8fcbd.tar.gz
ChangeLogTag:Tue May 08 21:26:19 2001 Carlos O'Ryan <coryan@uci.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a5
-rw-r--r--TAO/tests/AMI_Timeouts/client.cpp4
2 files changed, 9 insertions, 0 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 403d315983b..939c495e65d 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,8 @@
+Tue May 08 21:26:19 2001 Carlos O'Ryan <coryan@uci.edu>
+
+ * tests/AMI_Timeouts/client.cpp (main):
+ Wait for all the threads to complete before destroying the ORB.
+
Tue May 8 13:28:36 2001 Carlos O'Ryan <coryan@cs.wustl.edu>
* tao/Transport.cpp (send_message_i):
diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp
index e7923b51f18..4bdbefc4816 100644
--- a/TAO/tests/AMI_Timeouts/client.cpp
+++ b/TAO/tests/AMI_Timeouts/client.cpp
@@ -138,6 +138,10 @@ main (int argc, char *argv[])
ACE_TRY_ENV);
ACE_TRY_CHECK;
+ // Wait for all the threads to finish before destroying the
+ // ORB.
+ (void) client.thr_mgr ()->wait ();
+
orb->destroy (ACE_TRY_ENV);
ACE_TRY_CHECK;