diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2007-03-19 18:14:41 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2007-03-19 18:14:41 +0000 |
| commit | fbabccb75d2ad3293712c761a348a84be0009d28 (patch) | |
| tree | 99282fd4684b09ce2c45dcd0b049bc1579661537 | |
| parent | b64811525f4637042cf30078a4273e18a3d2baf9 (diff) | |
| download | ATCD-fbabccb75d2ad3293712c761a348a84be0009d28.tar.gz | |
ChangeLogTag: Mon Mar 19 19:13:59 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tests/Bug_2654_Regression/server.cpp | 5 |
2 files changed, 12 insertions, 0 deletions
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 <elliott_c@ociweb.com> + + * 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 <elliott_c@ociweb.com> * 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 (); |