Remove ORB runner as separate task, not necessary and only complicates this test

    * TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp:

1 files changed, 2 insertions, 21 deletions

diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp
index beff117a067..a3ff683ede1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp
@@ -8,24 +8,9 @@
 #include "tao/ImR_Client/ImR_Client.h"
 
 #include "ace/Get_Opt.h"
-#include "ace/Task.h"
 #include "ace/streams.h"
 #include "ace/OS_NS_unistd.h"
 
-class ORB_Runner : public ACE_Task_Base
-{
-public:
-  ORB_Runner (CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) {}
-  int svc (void)
-  {
-    this->orb_->run ();
-    return 0;
-  }
-
-private:
-  CORBA::ORB_var orb_;
-};
-
 PortableServer::POA_var root_poa;
 PortableServer::POA_var poa_a;
 
@@ -61,7 +46,6 @@ int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
-  ORB_Runner *runner = new ORB_Runner (orb.in ());
   int poa_delay = 10;
   int shutdown_delay = 0;
 
@@ -95,8 +79,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
       root_poa = PortableServer::POA::_narrow (obj.in ());
 
-      runner->activate ();
-
       ACE_CString base = ACE_CString ("TestObject");
       createPOAs (base);
 
@@ -138,10 +120,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       test_ior = orb->object_to_string (tva.in());
       base += "_a";
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) %C:\n%C\n", base.c_str(), test_ior.in()));
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) %C: %C\n", base.c_str(), test_ior.in()));
       table->bind (base.c_str (), test_ior.in ());
 
-      runner->wait ();
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) Destroying POA pid <%P>\n"));
 
@@ -154,7 +136,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       return 1;
     }
 
-  delete runner;
   orb = CORBA::ORB::_nil ();
 
   ACE_OS::sleep (shutdown_delay);