1 files changed, 19 insertions, 34 deletions

diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp
index 78bd1de184d..e2a7aab8d18 100644
--- a/TAO/examples/Simple/time-date/Time_Date.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date.cpp
@@ -38,23 +38,21 @@ DLL_ORB::svc (void)
   ACE_DEBUG ((LM_DEBUG,
               "\n\trunning ORB event loop (%t)\n\n"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Run the ORB event loop in its own thread.
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -73,7 +71,7 @@ DLL_ORB::init (int argc, char *argv[])
 //                         -1);
      }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                   "\n\tInitialize ORB (%t)\n\n"));
@@ -82,17 +80,13 @@ DLL_ORB::init (int argc, char *argv[])
       // Initialize the ORB.
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    "An ORB"
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    "An ORB");
 
       if (CORBA::is_nil (this->orb_.in ()))
         return -1;
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -100,16 +94,12 @@ DLL_ORB::init (int argc, char *argv[])
                           1);
 
       this->poa_ =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       this->poa_manager_ =
-        this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->poa_->the_POAManager ();
 
-      this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->poa_manager_->activate ();
 
 #if defined (ACE_HAS_THREADS)
       // Become an Active Object so that the ORB
@@ -119,11 +109,10 @@ DLL_ORB::init (int argc, char *argv[])
       return 0;
 #endif /* ACE_HAS_THREADS */
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "DLL_ORB::init");
+      ex._tao_print_exception ("DLL_ORB::init");
     }
-  ACE_ENDTRY;
 
   return -1;
 }
@@ -178,7 +167,7 @@ Time_Date_Servant::parse_args (int argc, char *argv[])
 int
 Time_Date_Servant::init (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                   "\n\tTime_Date servant\n\n"));
@@ -198,13 +187,10 @@ Time_Date_Servant::init (int argc, char *argv[])
       PortableServer::ServantBase_var safe_servant = servant;
 
       CORBA::Object_var obj =
-        servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant->_this ();
 
       CORBA::String_var str =
-        orb->orb_->object_to_string (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->orb_->object_to_string (obj.in ());
 
       if (this->ior_output_file_)
         {
@@ -215,12 +201,11 @@ Time_Date_Servant::init (int argc, char *argv[])
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "DLL_ORB::init");
+      ex._tao_print_exception ("DLL_ORB::init");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }