1 files changed, 14 insertions, 29 deletions

diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
index 15754f7aaf3..22a22d3b099 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
@@ -29,17 +29,13 @@ Server_Task::Server_Task (const char *output,
 int
 Server_Task::svc (void)
 {
- ACE_TRY_NEW_ENV
+ try
    {
      CORBA::Object_var poa_object =
-       this->sorb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->resolve_initial_references("RootPOA");
 
      PortableServer::POA_var root_poa =
-       PortableServer::POA::_narrow (poa_object.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       PortableServer::POA::_narrow (poa_object.in ());
 
      if (CORBA::is_nil (root_poa.in ()))
        ACE_ERROR_RETURN ((LM_ERROR,
@@ -47,8 +43,7 @@ Server_Task::svc (void)
                          1);
 
      PortableServer::POAManager_var poa_manager =
-       root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       root_poa->the_POAManager ();
 
      Hello *hello_impl;
      ACE_NEW_RETURN (hello_impl,
@@ -59,13 +54,10 @@ Server_Task::svc (void)
      PortableServer::ServantBase_var owner_transfer(hello_impl);
 
      Test::Hello_var hello =
-       hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       hello_impl->_this ();
 
      CORBA::String_var ior =
-       this->sorb_->object_to_string (hello.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->object_to_string (hello.in ());
 
      // Output the IOR to the <this->output_>
      FILE *output_file= ACE_OS::fopen (this->output_,
@@ -87,13 +79,10 @@ Server_Task::svc (void)
      PortableServer::ServantBase_var owner_transfer_simple(simple_impl);
 
      Test::Simple_Test_var simple_test =
-       simple_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       simple_impl->_this ();
 
      CORBA::String_var simple_test_ior =
-       this->sorb_->object_to_string (simple_test.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->object_to_string (simple_test.in ());
 
      // Output the IOR to the <this->output_>
      FILE *simple_test_output_file= ACE_OS::fopen (this->simple_test_output_,
@@ -107,14 +96,12 @@ Server_Task::svc (void)
      ACE_OS::fprintf (simple_test_output_file, "%s", simple_test_ior.in ());
      ACE_OS::fclose (simple_test_output_file);
 
-     poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     poa_manager->activate ();
 
      // Signal the main thread before we call orb->run ();
      this->me_.signal ();
 
-     this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     this->sorb_->run ();
 
      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
@@ -124,25 +111,23 @@ Server_Task::svc (void)
 
      error_count_ += errors;
    }
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
    {
      error_count_ ++;
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught:");
+     ex._tao_print_exception ("Exception caught:");
      return 1;
    }
- ACE_CATCHALL
+ catch (...)
    {
      error_count_ ++;
      ACE_ERROR ((LM_ERROR, "(%P|%t)Server_Task::svc - caught unknown exception \n"));
      return 1;
    }
- ACE_ENDTRY;
 
  return 0;
 }
 
-CORBA::ULong 
+CORBA::ULong
 Server_Task::error_count () const
 {
   return error_count_;