1 files changed, 11 insertions, 21 deletions

diff --git a/TAO/interop-tests/wchar/server.cpp b/TAO/interop-tests/wchar/server.cpp
index 8b464c4cbd5..0ba8e111404 100644
--- a/TAO/interop-tests/wchar/server.cpp
+++ b/TAO/interop-tests/wchar/server.cpp
@@ -80,8 +80,7 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
   ACE_OS::fclose (output_file);
   ACE_ERROR_RETURN ((LM_ERROR,"This test requires wchar support\n"),0);
 #else
-  ACE_DECLARE_NEW_ENV;
-  ACE_TRY
+  try
     {
         // Initialize orb
         CORBA::ORB_var orb = CORBA::ORB_init( command_line.get_argc(), command_line.get_ASCII_argv() );
@@ -89,21 +88,17 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
         //Get reference to Root POA
         CORBA::Object_var obj =
         orb->resolve_initial_references( "RootPOA"
-                                         ACE_ENV_ARG_PARAMETER );
-        ACE_TRY_CHECK;
+ );
 
         PortableServer::POA_var poa =
           PortableServer::POA::_narrow( obj.in()
-                                        ACE_ENV_ARG_PARAMETER );
-        ACE_TRY_CHECK;
+ );
 
         PortableServer::POAManager_var mgr =
-          poa->the_POAManager( ACE_ENV_SINGLE_ARG_PARAMETER );
-        ACE_TRY_CHECK;
+          poa->the_POAManager( );
 
         // Activate POA Manager
-        mgr->activate( ACE_ENV_SINGLE_ARG_PARAMETER );
-        ACE_TRY_CHECK;
+        mgr->activate( );
 
         // Create an object
         interop_WChar_Passer_i servant(orb.in(), verbose);
@@ -111,13 +106,11 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
         // Register the servant with the RootPOA, obtain its object
         // reference, stringify it, and write it to a file.
         obj = poa->servant_to_reference( &servant
-                                         ACE_ENV_ARG_PARAMETER );
-        ACE_TRY_CHECK;
+ );
 
         CORBA::String_var str =
           orb->object_to_string( obj.in()
-                                 ACE_ENV_ARG_PARAMETER );
-        ACE_TRY_CHECK;
+ );
 
         FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
         if (output_file == 0)
@@ -130,17 +123,14 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
         ACE_OS::fclose (output_file);
 
         // Accept requests
-        orb->run( ACE_ENV_SINGLE_ARG_PARAMETER );
-        ACE_TRY_CHECK;
-        orb->destroy( ACE_ENV_SINGLE_ARG_PARAMETER );
-        ACE_TRY_CHECK;
+        orb->run( );
+        orb->destroy( );
       }
-    ACE_CATCH(CORBA::Exception, ex)
+    catch (const CORBA::Exception& ex)
       {
-        ACE_PRINT_EXCEPTION(ex, "uncaught exception");
+        ex._tao_print_exception ("uncaught exception");
         return 1;
       }
-    ACE_ENDTRY;
 
     return 0;
 #endif /* ACE_HAS_WCHAR */