Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 14 insertions, 55 deletions

diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
index add3c0f5153..70e156b0232 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
@@ -49,7 +49,6 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[])
     orb_ = CORBA::ORB_init (command.get_argc(),
                             command.get_ASCII_argv(),
                             "" ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
 
     if (this->parse_args (command.get_argc(), command.get_TCHAR_argv()) == -1)
       return 1;
@@ -57,7 +56,6 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[])
     CORBA::Object_var root_poa_object =
       orb_->resolve_initial_references("RootPOA"
       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
     if (CORBA::is_nil (root_poa_object.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
       " (%P|%t) Unable to initialize the root POA.\n"),
@@ -65,18 +63,14 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[])
 
     PortableServer::POA_var root_poa =
       PortableServer::POA::_narrow (root_poa_object.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
 
     PortableServer::POAManager_var poa_manager =
-      root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      root_poa->the_POAManager ();
 
-    poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    poa_manager->activate ();
 
     CORBA::Object_var naming_obj =
       orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
     if (CORBA::is_nil (naming_obj.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
       " (%P|%t) Unable to initialize the Naming Service.\n"),
@@ -84,14 +78,11 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[])
 
     CosNaming::NamingContext_var naming_context =
       CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
 
     setup_scheduler(naming_context.in() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(-1);
 
 
-    poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    poa_manager->activate();
 
     // Activate the Event channel implementation
 
@@ -100,13 +91,11 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[])
     FtRtecEventChannelAdmin::EventChannel_var ec_ior =
       ec.activate(membership_
         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
 
     if (report_factory(orb_.in(), ec_ior.in() )==-1)
       return -1;
 
-    orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    orb_->run();
   }
   ACE_CATCHANY
   {
@@ -214,8 +203,7 @@ FT_EventService::setup_scheduler(CosNaming::NamingContext_ptr naming_context
             ACE_Config_Scheduler,
             CORBA::NO_MEMORY());
 
-        scheduler = this->sched_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        scheduler = this->sched_impl_->_this ();
 
         if (ACE_Scheduler_Factory::server(scheduler.in()) == -1)
             ACE_ERROR((LM_ERROR,"Unable to install scheduler\n"));
@@ -238,23 +226,19 @@ FT_EventService::setup_scheduler(CosNaming::NamingContext_ptr naming_context
                     ACE_Config_Scheduler,
                     CORBA::NO_MEMORY());
 
-                scheduler = this->sched_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_CHECK;
+                scheduler = this->sched_impl_->_this ();
 
                 // Register the servant with the Naming Context....
                 naming_context->rebind (schedule_name, scheduler.in ()
                     ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK;
             }
             else
             {
                 CORBA::Object_var tmp =
                     naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK;
 
                 scheduler = RtecScheduler::Scheduler::_narrow (tmp.in ()
                     ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK;
             }
         }
     }
@@ -281,7 +265,6 @@ FT_EventService::report_factory(CORBA::ORB_ptr orb,
       CORBA::String_var my_ior_string = orb->object_to_string(ec
         ACE_ENV_ARG_PARAMETER);
 
-      ACE_TRY_CHECK;
       int len = strlen(my_ior_string.in()) ;
 
       if (stream.send_n(my_ior_string.in(), len) != len)
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
index b4febf2f835..5c50d85167c 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -63,7 +63,6 @@ CORBA::Object_ptr EventChannelFactory_i::create_object (
     ACE_RE_THROW;
   }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN(CORBA::Object::_nil());
 
     ACE_THROW_RETURN(PortableGroup::ObjectNotCreated(), CORBA::Object::_nil());
 }
@@ -83,7 +82,7 @@ void EventChannelFactory_i::delete_object (
   CORBA::Object_var obj;
   if (objects.find(object_id, obj) == 0) {
     objects.unbind(object_id);
-    //obj->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
+    //obj->shutdown();
   }
 }
 
@@ -188,7 +187,6 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
   ACE_TRY_NEW_ENV {
     CORBA::Object_var result  = orb->string_to_object(ior
       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
 
     if (objects.bind(id, result) ==0){
       return result._retn();
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
index e2189bb34db..5871bfaa159 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
@@ -59,7 +59,6 @@ int main(int argc, ACE_TCHAR* argv[])
   ACE_TRY {
     CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, ""
                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
 
     if (parse_args(argc, argv) == -1)
       return -1;
@@ -67,24 +66,19 @@ int main(int argc, ACE_TCHAR* argv[])
     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;
 
-    PortableServer::POAManager_var mgr = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    PortableServer::POAManager_var mgr = poa->the_POAManager();
 
-    mgr->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    mgr->activate();
 
     EventChannelFactory_i servant("factory.cfg", orb.in());
 
     FT::GenericFactory_var event_channel_factory =
-      servant._this(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      servant._this();
 
     // register to the Event Service
 
@@ -92,12 +86,10 @@ int main(int argc, ACE_TCHAR* argv[])
       CORBA::Object_var namng_contex_object =
         orb->resolve_initial_references("NameService"
         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CosNaming::NamingContext_var naming_context =
         CosNaming::NamingContext::_narrow(namng_contex_object.in()
         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // register to naming service
       CosNaming::Name name(1);
@@ -108,7 +100,6 @@ int main(int argc, ACE_TCHAR* argv[])
 
       naming_context->bind(name, event_channel_factory.in()
         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_DEBUG((LM_DEBUG, "Register to naming service with %s", id.c_str()));
       if (kind.length())
@@ -120,7 +111,6 @@ int main(int argc, ACE_TCHAR* argv[])
       // get the IOR of factory
       CORBA::String_var str = orb->object_to_string(event_channel_factory.in()
         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (ACE_OS::strcmp(output.c_str(), "") != 0)
       {
@@ -137,9 +127,8 @@ int main(int argc, ACE_TCHAR* argv[])
       }
     }
 
-    ACE_TRY_CHECK;
 
-    orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
+    orb->run();
 
   }
   ACE_CATCHANY
@@ -149,7 +138,6 @@ int main(int argc, ACE_TCHAR* argv[])
   ACE_ENDTRY;
 
 
-  ACE_CHECK_RETURN(1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
index e431da580ae..326d5b0157e 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
@@ -38,10 +38,8 @@ int parse_args(int argc, ACE_TCHAR** argv)
         {
           CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ()
                                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
           ftec = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
                                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
         }
         break;
       case 'n':
@@ -59,12 +57,10 @@ int parse_args(int argc, ACE_TCHAR** argv)
       CosNaming::NamingContext_var naming_context =
         resolve_init<CosNaming::NamingContext>(orb.in(), "NameService"
         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ftec = resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context.in(),
         name
         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil(ftec.in()))
         ACE_ERROR_RETURN((LM_ERROR, "Cannot Find FT_EventService\n"), -1);
@@ -83,7 +79,6 @@ int main(int argc,  ACE_TCHAR** argv)
   {
     orb = CORBA::ORB_init (argc, argv, ""
                            ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
 
     if (parse_args(argc, argv)==-1)
       return 1;
@@ -91,28 +86,23 @@ int main(int argc,  ACE_TCHAR** argv)
     PortableServer::POA_var
       root_poa =  resolve_init<PortableServer::POA>(orb.in(), "RootPOA"
       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
 
     // create POAManager
     PortableServer::POAManager_var
-      mgr = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      mgr = root_poa->the_POAManager();
 
 
-    mgr->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    mgr->activate();
 
     TAO_FTRTEC::FTEC_Gateway gateway_servant(orb.in(), ftec.in());
 
     RtecEventChannelAdmin::EventChannel_var gateway =
       gateway_servant.activate(root_poa.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
 
     if (ior_file_name.length())
     {
       CORBA::String_var str = orb->object_to_string(gateway.in()
         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       FILE *output_file=
         ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(ior_file_name.c_str()),
@@ -126,7 +116,7 @@ int main(int argc,  ACE_TCHAR** argv)
       ACE_OS::fclose (output_file);
     }
 
-    orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
+    orb->run();
   }
   ACE_CATCHANY {
     return 1;