1 files changed, 56 insertions, 49 deletions

diff --git a/TAO/tests/Bug_2417_Regression/server.cpp b/TAO/tests/Bug_2417_Regression/server.cpp
index 32a267a7a7d..0c92fe55d2e 100644
--- a/TAO/tests/Bug_2417_Regression/server.cpp
+++ b/TAO/tests/Bug_2417_Regression/server.cpp
@@ -9,72 +9,79 @@
 class ThreadPool : public ACE_Task_Base
 {
 public:
-	ThreadPool (CORBA::ORB_ptr orb);
-	virtual int svc (void);
+  ThreadPool (CORBA::ORB_ptr orb);
+  virtual int svc (void);
 private:
-	CORBA::ORB_var orb_;
+  CORBA::ORB_var orb_;
 };
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-	try
+  try
     {
-    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-		CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+      CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA");
 
-		if (CORBA::is_nil (poa_object.in ()))
-			ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), 1);
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
 
-		PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in ());
-		PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager();
+      PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in ());
+      PortableServer::POAManager_var poa_manager =
+      root_poa->the_POAManager();
 
-		Publisher_impl publisher(orb.in ());
-		PortableServer::ObjectId_var id =
-		  root_poa->activate_object (&publisher);
+      Publisher_impl publisher(orb.in ());
+      PortableServer::ObjectId_var id = root_poa->activate_object (&publisher);
 
-		CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
 
-		Publisher_var publisher_var = Publisher::_narrow (object.in ());
+      Publisher_var publisher_var = Publisher::_narrow (object.in ());
 
-		CORBA::String_var ior = orb->object_to_string(publisher_var.in());
-		ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in()));
+      CORBA::String_var ior = orb->object_to_string(publisher_var.in());
+      ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in()));
 
-		// output the ior
-		FILE *output_file= ACE_OS::fopen ("ior.out", "w");
-		if (output_file == 0)
-			ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: ior.out"), 1);
-        ACE_OS::fprintf (output_file, "%s", ior.in ());
-        ACE_OS::fclose (output_file);
+      // output the ior
+      FILE *output_file= ACE_OS::fopen ("ior.out", "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: ior.out"),
+                          1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
 
-		poa_manager->activate();
+      poa_manager->activate();
 
-			const CORBA::Object_var pmobj ( orb->resolve_initial_references( "ORBPolicyManager" ) );
-			CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow( pmobj.in() );
+      const CORBA::Object_var pmobj (orb->resolve_initial_references("ORBPolicyManager" ) );
+      CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow(pmobj.in() );
 
-			CORBA::Any orb_level;
-			orb_level <<= Messaging::SYNC_NONE;
-			CORBA::PolicyList policy_list;
-			policy_list.length(1);
-			policy_list[0] = orb->create_policy(Messaging::SYNC_SCOPE_POLICY_TYPE, orb_level);
-			policy_manager->set_policy_overrides(policy_list, CORBA::SET_OVERRIDE);
+      CORBA::Any orb_level;
+      orb_level <<= Messaging::SYNC_NONE;
+      CORBA::PolicyList policy_list;
+      policy_list.length(1);
+      policy_list[0] = orb->create_policy(Messaging::SYNC_SCOPE_POLICY_TYPE,
+                                          orb_level);
+      policy_manager->set_policy_overrides(policy_list,
+                                           CORBA::SET_OVERRIDE);
 
-		ThreadPool pool (orb.in ());
-		if (pool.activate(THR_NEW_LWP | THR_JOINABLE, 5) != 0)
-			ACE_ERROR_RETURN ((LM_ERROR, "Cannot activate client threads\n"), 1);
+      ThreadPool pool (orb.in ());
+      if (pool.activate(THR_NEW_LWP | THR_JOINABLE, 5) != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot activate client threads\n"),
+                          1);
 
-		pool.thr_mgr ()->wait ();
+      pool.thr_mgr ()->wait ();
 
-		ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-	}
-	catch (const CORBA::Exception& ex)
+      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
+    }
+  catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Exception caught:");
       return 1;
     }
 
-	return 0;
+  return 0;
 }
 
 // ****************************************************************
@@ -86,12 +93,12 @@ ThreadPool::ThreadPool(CORBA::ORB_ptr orb)
 
 int ThreadPool::svc (void)
 {
-	try
-	{
-		this->orb_->run ();
-    }
-	catch (...)
-    {
-    }
-	return 0;
+  try
+  {
+    this->orb_->run ();
+  }
+  catch (...)
+  {
+  }
+  return 0;
 }