diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs')
4 files changed, 21 insertions, 34 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h index 181db2a5943..08c2d6bfe6a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h @@ -21,24 +21,21 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class AMI_Primary_Replication_Strategy; class Update_Manager; -class UpdateableHandler : public POA_FTRT::AMI_UpdateableHandler +class UpdateableHandler : public POA_FTRT::AMI_UpdateableHandler { public: - UpdateableHandler(AMI_Primary_Replication_Strategy* strategy); - ~UpdateableHandler(); + UpdateableHandler(AMI_Primary_Replication_Strategy* strategy); + ~UpdateableHandler(); - FTRT::AMI_UpdateableHandler_ptr activate( - Update_Manager* mgr, int id, - PortableServer::ObjectId& oid); - typedef void (Update_Manager::*Handler)(int); + FTRT::AMI_UpdateableHandler_ptr activate( + Update_Manager* mgr, int id, + PortableServer::ObjectId& oid); + typedef void (Update_Manager::*Handler)(int); - void dispatch(Handler handler) ; + void dispatch(Handler handler) ; - virtual void set_update ( - ); - virtual void set_update_excep ( - ::Messaging::ExceptionHolder * excep_holder - ); + virtual void set_update (); + virtual void set_update_excep (::Messaging::ExceptionHolder * excep_holder); private: AMI_Primary_Replication_Strategy* strategy_; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp index 644bbc5af99..7e6bd0996b3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp @@ -58,20 +58,17 @@ TAO_ComponentRepository_i::create_servants_and_poas ( // Request Processing Policy. policies[2] = this->root_poa_->create_request_processing_policy ( - PortableServer::USE_DEFAULT_SERVANT - ); + PortableServer::USE_DEFAULT_SERVANT); // Servant Retention Policy. policies[3] = this->root_poa_->create_servant_retention_policy ( - PortableServer::NON_RETAIN - ); + PortableServer::NON_RETAIN); // Id Uniqueness Policy. policies[4] = this->root_poa_->create_id_uniqueness_policy ( - PortableServer::MULTIPLE_ID - ); + PortableServer::MULTIPLE_ID); PortableServer::POAManager_var poa_manager = this->root_poa_->the_POAManager (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp index 0d6dc11b5aa..a9834a5c602 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp @@ -31,8 +31,8 @@ Standard_Event_Persistence::get_factory () { ACE_NEW_NORETURN ( this->factory_, - Standard_Event_Persistence_Factory () - ); + Standard_Event_Persistence_Factory ()); + if (this->factory_ != 0) { if (!this->factory_->open (this->filename_.c_str ())) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h index d2f01c4fe3c..042cb69528b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h @@ -129,31 +129,24 @@ namespace TAO virtual void register_factory ( const char * role, const char * type_id, - const PortableGroup::FactoryInfo & factory_info - ); + const PortableGroup::FactoryInfo & factory_info); virtual void unregister_factory ( const char * role, - const PortableGroup::Location & location - ); + const PortableGroup::Location & location); - virtual void unregister_factory_by_role ( - const char * role - ); + virtual void unregister_factory_by_role (const char * role); virtual void unregister_factory_by_location ( - const PortableGroup::Location & location - ); + const PortableGroup::Location & location); virtual ::PortableGroup::FactoryInfos * list_factories_by_role ( const char * role, - CORBA::String_out type_id - ); + CORBA::String_out type_id); virtual ::PortableGroup::FactoryInfos * list_factories_by_location ( - const PortableGroup::Location & location - ); + const PortableGroup::Location & location); ///////////////////////// // Implementation methods |