From fbabccb75d2ad3293712c761a348a84be0009d28 Mon Sep 17 00:00:00 2001 From: elliott_c Date: Mon, 19 Mar 2007 18:14:41 +0000 Subject: ChangeLogTag: Mon Mar 19 19:13:59 UTC 2007 Chad Elliott --- TAO/ChangeLog | 7 +++++++ TAO/tests/Bug_2654_Regression/server.cpp | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a25207de9cc..d1de1db3855 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Mon Mar 19 19:13:59 UTC 2007 Chad Elliott + + * tests/Bug_2654_Regression/server.cpp: + + Wait for threads started by the Hello implementation to avoid + access violations. + Mon Mar 19 16:21:11 UTC 2007 Chad Elliott * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp: diff --git a/TAO/tests/Bug_2654_Regression/server.cpp b/TAO/tests/Bug_2654_Regression/server.cpp index 7eaee0c0f00..1ee92fba8d4 100644 --- a/TAO/tests/Bug_2654_Regression/server.cpp +++ b/TAO/tests/Bug_2654_Regression/server.cpp @@ -3,6 +3,7 @@ #include "Hello.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Thread_Manager.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" ACE_RCSID (Hello, @@ -121,6 +122,10 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); + // Wait for threads that may have been started by the Hello + // implementation. + ACE_Thread_Manager::instance()->wait(); + root_poa->destroy (1, 1); orb->destroy (); -- cgit v1.2.1