ChangeLogTag: Fri Dec 12 09:29:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 28 insertions, 22 deletions

diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
index 8865ae101b8..52e3543d1ee 100644
--- a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
@@ -11,28 +11,34 @@
 //
 int main( int argc, char *argv[] )
 {
-   try
-   {
-      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv ) ;
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, 0 ACE_ENV_ARG_PARAMETER ) ;
+      ACE_TRY_CHECK;
 
-      try
-      {
-         CORBA::Object_var naming =
-            orb->resolve_initial_references( "NameService" ) ;
-         if( CORBA::is_nil( naming.in() ) )
-         {
-            return 1 ;
-         }
-      }
-      catch( CORBA::Exception&  )
-      {
-         return 1 ;
-      }
-   }
-   catch( CORBA::Exception&  )
-   {
-      return 2 ;
-   }
+      ACE_TRY_EX (nested)
+        {
+           CORBA::Object_var naming =
+              orb->resolve_initial_references( "NameService" ACE_ENV_ARG_PARAMETER) ;
+           ACE_TRY_CHECK_EX (nested);
+           if( CORBA::is_nil( naming.in() ) )
+             {
+                return 1 ;
+             }
+        }
+      ACE_CATCH (CORBA::Exception, ex)
+        {
+          ACE_UNUSED_ARG (ex);
+          return 1 ;
+        }
+      ACE_ENDTRY;
+    }
+  ACE_CATCH ( CORBA::Exception, ex )
+    {
+       ACE_UNUSED_ARG (ex);
+       return 2 ;
+    }
+  ACE_ENDTRY;
 
-   return 0 ;
+  return 0 ;
 }