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

1 files changed, 8 insertions, 26 deletions

diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
index 00f6f2e038d..4d8edd64f6a 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
@@ -35,7 +35,6 @@ Notify_Logging_Service::init_ORB (int& argc, char *argv []
                                 argv,
                                 ""
                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   this->notify_service_ = ACE_Dynamic_Service<TAO_Notify_Service>::instance (TAO_NOTIFY_DEF_EMO_FACTORY_NAME);
 
@@ -48,7 +47,6 @@ Notify_Logging_Service::init_ORB (int& argc, char *argv []
   CORBA::Object_var poa_object =
     this->orb_->resolve_initial_references("RootPOA"
                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -58,14 +56,11 @@ Notify_Logging_Service::init_ORB (int& argc, char *argv []
   this->poa_ =
     PortableServer::POA::_narrow (poa_object.in ()
                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate ();
 
   return 0;
 }
@@ -131,7 +126,6 @@ Notify_Logging_Service::init (int argc, char *argv[]
     return -1;
 
   this->notify_service_->init_service (this->orb_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   // Activate the factory
   this->notify_factory_ =
@@ -147,25 +141,20 @@ Notify_Logging_Service::init (int argc, char *argv[]
                                    this->poa_.in ()
                                    ACE_ENV_ARG_PARAMETER);
 
-  ACE_CHECK_RETURN (-1);
 
   CORBA::String_var ior =
     this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   if (true)
     {
       CORBA::Object_var table_object =
         this->orb_->resolve_initial_references ("IORTable"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
 
       IORTable::Table_var adapter =
         IORTable::Table::_narrow (table_object.in ());
-      ACE_CHECK_RETURN (-1);
 
       adapter->bind("NotifyLogService", ior.in ());
-      ACE_CHECK_RETURN (-1);
     }
 
   if (this->ior_file_name_ != 0)
@@ -198,8 +187,7 @@ Notify_Logging_Service::init (int argc, char *argv[]
   if (this->bind_to_naming_service_)
     {
       // Resolve the naming service.
-      this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->resolve_naming_service ();
 
       CosNaming::Name name (1);
       name.length (1);
@@ -208,19 +196,17 @@ Notify_Logging_Service::init (int argc, char *argv[]
       this->naming_->rebind (name,
                              obj.in ()
                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
     }
 
   return 0;
 }
 
 void
-Notify_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Logging_Service::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService"
                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
@@ -229,11 +215,10 @@ Notify_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
   this->naming_ =
     CosNaming::NamingContext::_narrow (naming_obj.in ()
                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 int
-Notify_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Logging_Service::run (void)
 {
   if (this->nthreads_ > 0)
     {
@@ -244,8 +229,7 @@ Notify_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
       return 0;
     }
 
-  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_->run ();
 
   return 0;
 }
@@ -256,8 +240,7 @@ Notify_Logging_Service::svc (void)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
   ACE_CATCHANY
     {
@@ -269,7 +252,7 @@ Notify_Logging_Service::svc (void)
 }
 
 void
-Notify_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Logging_Service::shutdown (void)
 {
   if (this->bind_to_naming_service_)
     {
@@ -279,7 +262,6 @@ Notify_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 
       this->naming_->unbind (name
                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
     }
 
   // shutdown the ORB.