From c801f87e59c00f72bdeb5ce7bd0d276674665bac Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed, 24 Jan 2007 15:39:09 +0000
Subject: Wed Jan 24 14:00:12 UTC 2007  Johnny Willemsen 
 <jwillemsen@remedy.nl>

---
 TAO/tests/Client_Leaks/child.cpp | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'TAO/tests/Client_Leaks/child.cpp')

diff --git a/TAO/tests/Client_Leaks/child.cpp b/TAO/tests/Client_Leaks/child.cpp
index 4ee5c104d0b..1306fce8821 100644
--- a/TAO/tests/Client_Leaks/child.cpp
+++ b/TAO/tests/Client_Leaks/child.cpp
@@ -12,14 +12,12 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (argc < 2)
         {
           // Paranoia, we should have an auto_ptr-like gadget for
           // this.
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->destroy ();
 
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Usage: %s <ior>\n",
@@ -28,10 +26,8 @@ main (int argc, char *argv[])
 
       CORBA::Object_var object =
         orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       Test::Startup_Callback_var startup_callback =
         Test::Startup_Callback::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (CORBA::is_nil (startup_callback.in ()))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -41,11 +37,9 @@ main (int argc, char *argv[])
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -53,8 +47,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       Process *process_impl;
       ACE_NEW_RETURN (process_impl,
@@ -63,24 +56,18 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(process_impl);
 
       Test::Process_var process =
-        process_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        process_impl->_this ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       startup_callback->started (process.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_Time_Value tv (50, 0);
       orb->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   ACE_CATCHANY
     {
-- 
cgit v1.2.1