ChangeLogTag: Thu Jan 25 17:39:59 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

10 files changed, 87 insertions, 136 deletions

diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp
index 2ef6f261718..d3cc973272b 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.cpp
+++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp
@@ -10,25 +10,21 @@ ACE_RCSID (LongUpcalls,
            "$Id$")
 
 static void
-validate_connection (Test::Controller_ptr controller
-                     ACE_ENV_ARG_DECL)
+validate_connection (Test::Controller_ptr controller)
   ACE_THROW_SPEC (())
 {
-  ACE_TRY
+  try
     {
 #if (TAO_HAS_CORBA_MESSAGING == 1)
       CORBA::PolicyList_var unused;
-      controller->_validate_connection (unused
-                                        ACE_ENV_ARG_PARAMETER);
+      controller->_validate_connection (unused);
 #else
-      controller->_is_a ("Not_an_IDL_Type"
-                         ACE_ENV_ARG_PARAMETER);
+      controller->_is_a ("Not_an_IDL_Type");
 #endif
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
 }
 
 AMI_Manager::AMI_Manager (CORBA::ORB_ptr orb)
@@ -39,14 +35,12 @@ AMI_Manager::AMI_Manager (CORBA::ORB_ptr orb)
 void
 AMI_Manager::start_workers (CORBA::Short worker_count,
                             CORBA::Long milliseconds,
-                            Test::Controller_ptr controller
-                            ACE_ENV_ARG_DECL)
+                            Test::Controller_ptr controller)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Thread_Manager thread_manager;
 
-  validate_connection(controller
-                      ACE_ENV_ARG_PARAMETER);
+  validate_connection(controller);
 
   // ACE_DEBUG ((LM_DEBUG, "Starting %d workers\n", worker_count));
   Worker worker (&thread_manager,
@@ -62,7 +56,7 @@ void
 AMI_Manager::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 // ****************************************************************
@@ -82,8 +76,7 @@ int
 Worker::svc (void)
 {
   // ACE_DEBUG ((LM_DEBUG, "Worker starts\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       TAO_SYNCH_MUTEX mutex;
       int pending_requests = 2;
@@ -100,38 +93,33 @@ Worker::svc (void)
         handler = handler_impl->_this ();
       }
 
-      validate_connection(this->controller_.in()
-                          ACE_ENV_ARG_PARAMETER);
+      validate_connection(this->controller_.in());
 
-      this->controller_->sendc_worker_started (handler.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+      this->controller_->sendc_worker_started (handler.in ());
 
       // ACE_DEBUG ((LM_DEBUG, "Worker start reported\n"));
 
       ACE_Time_Value tv (0, 1000 * this->milliseconds_);
       ACE_OS::sleep (tv);
 
-      this->controller_->sendc_worker_finished (handler.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+      this->controller_->sendc_worker_finished (handler.in ());
 
       // ACE_DEBUG ((LM_DEBUG, "Worker completion reported\n"));
 
       for (;;)
         {
           ACE_Time_Value tv (0, 1000 * this->milliseconds_);
-          this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
+          this->orb_->run (tv);
 
           ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, mutex, -1);
           if (pending_requests == 0)
             break;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in svc() method\n");
+      ex._tao_print_exception ("Exception in svc() method\n");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -154,21 +142,18 @@ Controller_Handler::worker_started (void)
 
 void
 Controller_Handler::worker_started_excep
-    (::Messaging::ExceptionHolder* h
-     ACE_ENV_ARG_DECL)
+    (::Messaging::ExceptionHolder* h)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       h->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Controller_Handler exception raised in"
-                           " worker_started");
+      ex._tao_print_exception (
+        "Controller_Handler exception raised in"" worker_started");
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -181,19 +166,16 @@ Controller_Handler::worker_finished (void)
 
 void
 Controller_Handler::worker_finished_excep
-    (::Messaging::ExceptionHolder *h
-     ACE_ENV_ARG_DECL)
+    (::Messaging::ExceptionHolder *h)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       h->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Controller_Handler exception raised in"
-                           " worker_finished");
+      ex._tao_print_exception (
+        "Controller_Handler exception raised in"" worker_finished");
     }
-  ACE_ENDTRY;
 }
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h
index 36236d5b35b..271f1d5b4c3 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.h
+++ b/TAO/tests/LongUpcalls/AMI_Manager.h
@@ -16,8 +16,7 @@ public:
   // = The skeleton methods
   virtual void start_workers (CORBA::Short worker_count,
                               CORBA::Long milliseconds,
-                              Test::Controller_ptr controller
-                              ACE_ENV_ARG_DECL)
+                              Test::Controller_ptr controller)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -63,13 +62,11 @@ public:
 
   virtual void worker_started (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void worker_started_excep (::Messaging::ExceptionHolder*
-                                     ACE_ENV_ARG_DECL)
+  virtual void worker_started_excep (::Messaging::ExceptionHolder*)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void worker_finished (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void worker_finished_excep (::Messaging::ExceptionHolder*
-                                      ACE_ENV_ARG_DECL)
+  virtual void worker_finished_excep (::Messaging::ExceptionHolder*)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/LongUpcalls/Manager.cpp b/TAO/tests/LongUpcalls/Manager.cpp
index 3cb9d08d740..8d2f8d8442a 100644
--- a/TAO/tests/LongUpcalls/Manager.cpp
+++ b/TAO/tests/LongUpcalls/Manager.cpp
@@ -10,25 +10,21 @@ ACE_RCSID (LongUpcalls,
            "$Id$")
 
 static void
-validate_connection (Test::Controller_ptr controller
-                     ACE_ENV_ARG_DECL)
+validate_connection (Test::Controller_ptr controller)
   ACE_THROW_SPEC (())
 {
-  ACE_TRY
+  try
     {
 #if (TAO_HAS_CORBA_MESSAGING == 1)
       CORBA::PolicyList_var unused;
-      controller->_validate_connection (unused
-                                        ACE_ENV_ARG_PARAMETER);
+      controller->_validate_connection (unused);
 #else
-      controller->_is_a ("Not_an_IDL_Type"
-                         ACE_ENV_ARG_PARAMETER);
+      controller->_is_a ("Not_an_IDL_Type");
 #endif
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
 }
 
 Manager::Manager (CORBA::ORB_ptr orb)
@@ -39,14 +35,12 @@ Manager::Manager (CORBA::ORB_ptr orb)
 void
 Manager::start_workers (CORBA::Short worker_count,
                         CORBA::Long milliseconds,
-                        Test::Controller_ptr controller
-                        ACE_ENV_ARG_DECL)
+                        Test::Controller_ptr controller)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Thread_Manager thread_manager;
 
-  validate_connection(controller
-                      ACE_ENV_ARG_PARAMETER);
+  validate_connection(controller);
 
   // ACE_DEBUG ((LM_DEBUG, "Starting %d workers\n", worker_count));
   Worker worker (&thread_manager,
@@ -61,7 +55,7 @@ void
 Manager::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 
@@ -80,11 +74,9 @@ int
 Worker::svc (void)
 {
   // ACE_DEBUG ((LM_DEBUG, "Worker starts\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      validate_connection(this->controller_.in()
-                          ACE_ENV_ARG_PARAMETER);
+      validate_connection(this->controller_.in());
 
       this->controller_->worker_started ();
 
@@ -97,11 +89,9 @@ Worker::svc (void)
 
       // ACE_DEBUG ((LM_DEBUG, "Worker completion reported\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in svc() method\n");
+      ex._tao_print_exception ("Exception in svc() method\n");
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/LongUpcalls/Manager.h b/TAO/tests/LongUpcalls/Manager.h
index 78c75c5b519..313c0be7b06 100644
--- a/TAO/tests/LongUpcalls/Manager.h
+++ b/TAO/tests/LongUpcalls/Manager.h
@@ -18,8 +18,7 @@ public:
   // = The skeleton methods
   virtual void start_workers (CORBA::Short worker_count,
                               CORBA::Long milliseconds,
-                              Test::Controller_ptr controller
-                              ACE_ENV_ARG_DECL)
+                              Test::Controller_ptr controller)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.cpp b/TAO/tests/LongUpcalls/Manager_Handler.cpp
index a005874b6ee..49964f970a9 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.cpp
+++ b/TAO/tests/LongUpcalls/Manager_Handler.cpp
@@ -17,35 +17,29 @@ void
 Manager_Handler::start_workers (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       this->manager_->start_workers (CORBA::Short(10),
                                      CORBA::Long(1000),
-                                     this->controller_.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this->controller_.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised in nested start workers: ");
+      ex._tao_print_exception ("Exception raised in nested start workers: ");
     }
-  ACE_ENDTRY;
 }
 
 void
-Manager_Handler::start_workers_excep (::Messaging::ExceptionHolder * holder
-                                      ACE_ENV_ARG_DECL)
+Manager_Handler::start_workers_excep (::Messaging::ExceptionHolder * holder)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       holder->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised in asynch start workers: ");
+      ex._tao_print_exception ("Exception raised in asynch start workers: ");
     }
-  ACE_ENDTRY;
 }
 
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.h b/TAO/tests/LongUpcalls/Manager_Handler.h
index 9dbc6426118..9899fa0b440 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.h
+++ b/TAO/tests/LongUpcalls/Manager_Handler.h
@@ -19,8 +19,7 @@ public:
   // = The skeleton methods
   virtual void start_workers (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void start_workers_excep (::Messaging::ExceptionHolder *holder
-                                    ACE_ENV_ARG_DECL)
+  virtual void start_workers_excep (::Messaging::ExceptionHolder *holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp
index 790594ef9be..73bddabb7ae 100644
--- a/TAO/tests/LongUpcalls/ami_client.cpp
+++ b/TAO/tests/LongUpcalls/ami_client.cpp
@@ -36,13 +36,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -50,7 +50,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -63,10 +63,10 @@ main (int argc, char *argv[])
       Test::Controller_var controller =
         controller_impl._this ();
 
-      object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+      object = orb->string_to_object (ior);
 
       Test::Manager_var manager =
-        Test::Manager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        Test::Manager::_narrow (object.in ());
 
       if (CORBA::is_nil (manager.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -84,27 +84,24 @@ main (int argc, char *argv[])
       manager->sendc_start_workers (handler.in (),
                                     worker_count,
                                     CORBA::Long (1000),
-                                    controller.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+                                    controller.in ());
 
       ACE_Time_Value tv (30, 0);
-      orb->run (tv ACE_ENV_ARG_PARAMETER);
+      orb->run (tv);
 
       controller_impl.dump_results ();
 
       manager->shutdown ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp
index 749ec6befa5..5217b89ccf7 100644
--- a/TAO/tests/LongUpcalls/ami_server.cpp
+++ b/TAO/tests/LongUpcalls/ami_server.cpp
@@ -35,13 +35,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -49,7 +49,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -63,7 +63,7 @@ main (int argc, char *argv[])
         manager_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (manager.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (manager.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -81,17 +81,15 @@ main (int argc, char *argv[])
 
       // ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp
index a63580bb2a8..1321790d3fd 100644
--- a/TAO/tests/LongUpcalls/blocking_client.cpp
+++ b/TAO/tests/LongUpcalls/blocking_client.cpp
@@ -35,13 +35,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -49,7 +49,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -62,10 +62,10 @@ main (int argc, char *argv[])
       Test::Controller_var controller =
         controller_impl._this ();
 
-      object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+      object = orb->string_to_object (ior);
 
       Test::Manager_var manager =
-        Test::Manager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        Test::Manager::_narrow (object.in ());
 
       if (CORBA::is_nil (manager.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,24 +78,21 @@ main (int argc, char *argv[])
       const CORBA::Short worker_count = 10;
       manager->start_workers (worker_count,
                               CORBA::Long (1000),
-                              controller.in ()
-                              ACE_ENV_ARG_PARAMETER);
+                              controller.in ());
 
       controller_impl.dump_results ();
 
       manager->shutdown ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp
index 7abf137233f..80e6b304e2e 100644
--- a/TAO/tests/LongUpcalls/blocking_server.cpp
+++ b/TAO/tests/LongUpcalls/blocking_server.cpp
@@ -35,13 +35,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -49,7 +49,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -63,7 +63,7 @@ main (int argc, char *argv[])
         manager_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (manager.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (manager.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -81,17 +81,15 @@ main (int argc, char *argv[])
 
       // ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }