1 files changed, 5 insertions, 15 deletions

diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
index a1c2d6de7e5..d10a5183eb3 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
@@ -8,8 +8,8 @@
 
 #include "Iterator_Factory_i.h"
 
-ACE_RCSID (AMI_Iterator, 
-           server, 
+ACE_RCSID (AMI_Iterator,
+           server,
            "$Id$")
 
 int
@@ -23,39 +23,32 @@ main (int argc, char *argv[])
                                             argv,
                                             "Mighty ORB"
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Get the 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;
 
       // Activate the POA manager.
       PortableServer::POAManager_var mgr = poa->the_POAManager ();
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Create the Iterator_Factory servant and object.
       // It activates and deactivates the Content_Iterator object.
       Iterator_Factory_i factory_servant;
       Web_Server::Iterator_Factory_var factory =
-        factory_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        factory_servant._this ();
 
       // Get a reference to the Name Service.
       obj = orb->resolve_initial_references ("NameService"
                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Narrow to a Naming Context
       CosNaming::NamingContext_var nc =
         CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Create a name.
       CosNaming::Name name;
@@ -64,12 +57,10 @@ main (int argc, char *argv[])
       name[0].kind = CORBA::string_dup ("");
 
       nc->bind (name, factory.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Some debugging output.
       CORBA::String_var IOR = orb->object_to_string (factory.in ()
                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("Bound <%s> to <%s> in Name Service.\n"),
                   name[0].id.in (),
@@ -79,8 +70,7 @@ main (int argc, char *argv[])
                   ACE_TEXT ("Accepting requests.\n")));
 
       // Accept requests.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
   ACE_CATCHANY
     {