summaryrefslogtreecommitdiff
path: root/TAO/tests/Bug_2654_Regression/server.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/Bug_2654_Regression/server.cpp')
-rw-r--r--TAO/tests/Bug_2654_Regression/server.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/TAO/tests/Bug_2654_Regression/server.cpp b/TAO/tests/Bug_2654_Regression/server.cpp
index baa8221e271..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,
@@ -43,7 +44,7 @@ main (int argc, char *argv[])
try
{
CORBA::ORB_var orb =
- CORBA::ORB_init (argc, argv, "");
+ CORBA::ORB_init (argc, argv);
CORBA::Object_var obj =
orb->resolve_initial_references("RootPOA");
@@ -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 ();