diff options
27 files changed, 91 insertions, 96 deletions
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index b5822a2d438..a0996627247 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -322,37 +322,32 @@ TAO_Active_Object_Map::~TAO_Active_Object_Map (void) delete this->user_id_map_; } -int +bool TAO_Active_Object_Map::is_user_id_in_map (const PortableServer::ObjectId &user_id, CORBA::Short priority, - int &priorities_match, - int &deactivated) + bool &priorities_match, + bool &deactivated) { TAO_Active_Object_Map_Entry *entry = 0; - int result = this->user_id_map_->find (user_id, - entry); - if (result == 0) + bool result = false; + int const find_result = this->user_id_map_->find (user_id, + entry); + if (find_result == 0) { if (entry->servant_ == 0) { - result = 0; - if (entry->priority_ != priority) - priorities_match = 0; + priorities_match = false; } else { - result = 1; + result = true; if (entry->deactivated_) { - deactivated = 1; + deactivated = true; } } } - else - { - result = 0; - } return result; } @@ -371,7 +366,7 @@ TAO_Id_Uniqueness_Strategy::set_active_object_map (TAO_Active_Object_Map *active int TAO_Unique_Id_Strategy::is_servant_in_map (PortableServer::Servant servant, - int &deactivated) + bool &deactivated) { TAO_Active_Object_Map_Entry *entry = 0; int result = this->active_object_map_->servant_map_->find (servant, @@ -381,7 +376,7 @@ TAO_Unique_Id_Strategy::is_servant_in_map (PortableServer::Servant servant, result = 1; if (entry->deactivated_) { - deactivated = 1; + deactivated = true; } } else @@ -528,7 +523,7 @@ TAO_Unique_Id_Strategy::remaining_activations (PortableServer::Servant servant) int TAO_Multiple_Id_Strategy::is_servant_in_map (PortableServer::Servant, - int &) + bool &) { return -1; } diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h index 83ebca8823c..7232685a272 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.h +++ b/TAO/tao/PortableServer/Active_Object_Map.h @@ -58,14 +58,14 @@ public: /// Must be used with UNIQUE_ID policy. int is_servant_in_map (PortableServer::Servant servant, - int &deactivated); + bool &deactivated); /// Can be used with any policy. With the SYSTEM_ID policy, /// user_id is actually system_id. - int is_user_id_in_map (const PortableServer::ObjectId &user_id, - CORBA::Short priority, - int &priorities_match, - int &deactivated); + bool is_user_id_in_map (const PortableServer::ObjectId &user_id, + CORBA::Short priority, + bool &priorities_match, + bool &deactivated); /// Must be used with SYSTEM_ID policy. int bind_using_system_id_returning_system_id (PortableServer::Servant servant, @@ -250,7 +250,7 @@ public: /// Must be used with UNIQUE_ID policy. virtual int is_servant_in_map (PortableServer::Servant servant, - int &deactivated) = 0; + bool &deactivated) = 0; /// Can be used with any policy. With the SYSTEM_ID policy, /// <user_id> is actually <system_id>. @@ -300,7 +300,7 @@ public: /// Must be used with UNIQUE_ID policy. virtual int is_servant_in_map (PortableServer::Servant servant, - int &deactivated); + bool &deactivated); /// Can be used with any policy. With the SYSTEM_ID policy, /// <user_id> is actually <system_id>. @@ -342,7 +342,7 @@ public: /// Must be used with UNIQUE_ID policy. virtual int is_servant_in_map (PortableServer::Servant servant, - int &deactivated); + bool &deactivated); /// Can be used with any policy. With the SYSTEM_ID policy, /// <user_id> is actually <system_id>. diff --git a/TAO/tao/PortableServer/Active_Object_Map.inl b/TAO/tao/PortableServer/Active_Object_Map.inl index 31b3326b811..4ccd3ff3281 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.inl +++ b/TAO/tao/PortableServer/Active_Object_Map.inl @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int TAO_Active_Object_Map::is_servant_in_map (PortableServer::Servant servant, - int &deactivated) + bool &deactivated) { return this->id_uniqueness_strategy_->is_servant_in_map (servant, deactivated); diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp index fc29e9faec0..8c622b4eaea 100644 --- a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp @@ -13,7 +13,7 @@ TAO_Active_Object_Map_Entry::TAO_Active_Object_Map_Entry (void) system_id_ (), servant_ (0), reference_count_ (1), - deactivated_ (0), + deactivated_ (false), priority_ (-1) { } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategy.h b/TAO/tao/PortableServer/IdUniquenessStrategy.h index de0fb20c737..72fcc22dbc7 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategy.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategy.h @@ -41,7 +41,7 @@ namespace TAO */ virtual bool is_servant_activation_allowed ( PortableServer::Servant s, - int &w) = 0; + bool &w) = 0; virtual bool allow_multiple_activations (void) const = 0; diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp index d1071f1470c..8fb4db2d48b 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp @@ -29,7 +29,7 @@ namespace TAO bool IdUniquenessStrategyMultiple::is_servant_activation_allowed ( PortableServer::Servant /*servant*/, - int & /*wait_occurred_restart_call*/) + bool & /*wait_occurred_restart_call*/) { // With the multiple id strategy we can always activate the servant // another time diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h index f3c2e405447..92179068d95 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h @@ -39,7 +39,7 @@ namespace TAO virtual bool is_servant_activation_allowed ( PortableServer::Servant servant, - int &w); + bool &w); virtual bool allow_multiple_activations (void) const; diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp index 3c5516d4956..061cb611907 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp @@ -37,11 +37,11 @@ namespace TAO bool IdUniquenessStrategyUnique::is_servant_activation_allowed ( PortableServer::Servant servant, - int &wait_occurred_restart_call) + bool &wait_occurred_restart_call) { // If the specified servant is already in the Active Object Map, the // ServantAlreadyActive exception is raised. - int result = + int const result = this->poa_->is_servant_active (servant, wait_occurred_restart_call); diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h index 58bbf096de5..8bcdbe180f7 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h @@ -42,7 +42,7 @@ namespace TAO virtual bool is_servant_activation_allowed ( PortableServer::Servant servant, - int &wait_occurred_restart_call); + bool &wait_occurred_restart_call); virtual bool allow_multiple_activations (void) const; diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h index 8c767103d0b..19ae155a117 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h @@ -96,7 +96,7 @@ namespace TAO const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL) = 0; virtual void cleanup_servant ( diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp index 877f8033219..718132bda26 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp @@ -80,7 +80,7 @@ namespace TAO const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - int & /*wait_occurred_restart_call*/ + bool & /*wait_occurred_restart_call*/ ACE_ENV_ARG_DECL) { PortableServer::Servant servant = 0; diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h index b8b1b493ad4..6e16c94e876 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h @@ -78,7 +78,7 @@ namespace TAO const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL); virtual PortableServer::Servant system_id_to_servant ( diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp index 63e873629e9..475a98bade3 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp @@ -128,7 +128,7 @@ namespace TAO const PortableServer::ObjectId & system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - int & /*wait_occurred_restart_call*/ + bool & /*wait_occurred_restart_call*/ ACE_ENV_ARG_DECL) { PortableServer::Servant servant = 0; diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h index 6752b0dfe36..dea5baa5697 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h @@ -74,7 +74,7 @@ namespace TAO const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL); virtual PortableServer::Servant system_id_to_servant ( diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp index 2010b5e9076..f0289e350b6 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp @@ -108,7 +108,7 @@ namespace TAO const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL) { PortableServer::Servant servant = 0; diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h index 19e1337576b..559cc8ce071 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h @@ -59,7 +59,7 @@ namespace TAO const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL); virtual void cleanup_servant ( diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp index 481521ad6fb..df7de1de8bb 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp @@ -103,7 +103,7 @@ namespace TAO const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - int &/*wait_occurred_restart_call*/ + bool &/*wait_occurred_restart_call*/ ACE_ENV_ARG_DECL) { PortableServer::Servant servant = 0; diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h index 79cac166c68..255c5448cfd 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h @@ -65,7 +65,7 @@ namespace TAO const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL); virtual void cleanup_servant ( diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 458c909ee3d..e113271b4fd 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -250,7 +250,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name, #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) filter_factory_ (0), -#endif +#endif caller_key_to_object_ (0), servant_for_key_to_object_ (0) @@ -430,7 +430,7 @@ TAO_Root_POA::create_POA_i (const char *adapter_name, if (CORBA::is_nil (poa_manager)) { -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) PortableServer::POA_var poa = PortableServer::POA::_duplicate (this); PortableServer::POA_var root_poa; @@ -457,7 +457,7 @@ TAO_Root_POA::create_POA_i (const char *adapter_name, empty_policies ACE_ENV_ARG_PARAMETER); #else - + ACE_NEW_THROW_EX (the_poa_manager, TAO_POA_Manager (this->object_adapter (), 0), CORBA::NO_MEMORY ()); @@ -1222,7 +1222,7 @@ TAO_Root_POA::adapter_state_changed ( PortableServer::ObjectId * TAO_Root_POA::activate_object_i (PortableServer::Servant servant, CORBA::Short priority, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, @@ -1244,7 +1244,7 @@ TAO_Root_POA::activate_object (PortableServer::Servant servant { while (1) { - int wait_occurred_restart_call = 0; + bool wait_occurred_restart_call = false; // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -1278,7 +1278,7 @@ TAO_Root_POA::activate_object_with_id (const PortableServer::ObjectId &id, { while (1) { - int wait_occurred_restart_call = 0; + bool wait_occurred_restart_call = false; // Lock access for the duration of this transaction. TAO_POA_GUARD; @@ -1306,7 +1306,7 @@ void TAO_Root_POA::activate_object_with_id_i (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, @@ -1776,7 +1776,7 @@ TAO_Root_POA::locate_servant_i (const char *operation, const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL) { return this->active_policy_strategies_.request_processing_strategy()-> @@ -2309,7 +2309,7 @@ TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key, this->client_exposed_policies (priority ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + TAO_Acceptor_Filter* filter = 0; #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) @@ -2737,7 +2737,7 @@ TAO_Root_POA::set_servant (PortableServer::Servant servant bool TAO_Root_POA::is_servant_activation_allowed (PortableServer::Servant servant, - int &wait_occurred_restart_call) + bool &wait_occurred_restart_call) { return this->active_policy_strategies_.id_uniqueness_strategy ()-> is_servant_activation_allowed (servant, wait_occurred_restart_call); @@ -2803,7 +2803,7 @@ TAO_Root_POA::server_priority (void) const int TAO_Root_POA::is_servant_active ( PortableServer::Servant servant, - int &wait_occurred_restart_call) + bool &wait_occurred_restart_call) { return this->active_policy_strategies_.servant_retention_strategy ()-> is_servant_in_map (servant, wait_occurred_restart_call); diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h index d4166ebfc5c..34128790c9b 100644 --- a/TAO/tao/PortableServer/Root_POA.h +++ b/TAO/tao/PortableServer/Root_POA.h @@ -471,7 +471,7 @@ public: */ bool is_servant_activation_allowed ( PortableServer::Servant servant, - int &wait_occurred_restart_call); + bool &wait_occurred_restart_call); int rebind_using_user_id_and_system_id ( PortableServer::Servant servant, @@ -488,7 +488,7 @@ public: int is_servant_active ( PortableServer::Servant servant, - int &wait_occurred_restart_call); + bool &wait_occurred_restart_call); void deactivate_object_i (const PortableServer::ObjectId &oid ACE_ENV_ARG_DECL) @@ -547,7 +547,7 @@ public: PortableServer::ObjectId *activate_object_i ( PortableServer::Servant p_servant, CORBA::Short priority, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, @@ -720,7 +720,7 @@ protected: void activate_object_with_id_i (const PortableServer::ObjectId &id, PortableServer::Servant p_servant, CORBA::Short priority, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, @@ -837,7 +837,7 @@ protected: const PortableServer::ObjectId &id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL ); diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h index 053fcb8961e..77377a53539 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategy.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h @@ -42,7 +42,7 @@ namespace TAO virtual CORBA::ULong waiting_servant_deactivation (void) const = 0; virtual int is_servant_in_map (PortableServer::Servant servant, - int &wait_occurred_restart_call) = 0; + bool &wait_occurred_restart_call) = 0; virtual TAO_SERVANT_LOCATION servant_present ( const PortableServer::ObjectId &system_id, @@ -63,7 +63,7 @@ namespace TAO virtual PortableServer::ObjectId *activate_object ( PortableServer::Servant servant, CORBA::Short priority, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, @@ -74,7 +74,7 @@ namespace TAO const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp index 70be396ed0b..3b48b5ab1bf 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp @@ -149,7 +149,7 @@ namespace TAO int ServantRetentionStrategyNonRetain::is_servant_in_map ( PortableServer::Servant /*servant*/, - int &/*wait_occurred_restart_call*/) + bool &/*wait_occurred_restart_call*/) { return 0; } @@ -196,7 +196,7 @@ namespace TAO ServantRetentionStrategyNonRetain::activate_object ( PortableServer::Servant /*servant*/, CORBA::Short /*priority*/, - int &/*wait_occurred_restart_call*/ + bool &/*wait_occurred_restart_call*/ ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, @@ -212,7 +212,7 @@ namespace TAO const PortableServer::ObjectId &/*id*/, PortableServer::Servant /*servant*/, CORBA::Short /*priority*/, - int &/*wait_occurred_restart_call*/ + bool &/*wait_occurred_restart_call*/ ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h index 1b26e36fe54..2b8780343dc 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h @@ -46,7 +46,7 @@ namespace TAO PortableServer::ObjectId * activate_object (PortableServer::Servant servant, CORBA::Short priority, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, @@ -58,7 +58,7 @@ namespace TAO activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, @@ -74,7 +74,7 @@ namespace TAO ACE_ENV_ARG_DECL); virtual int is_servant_in_map (PortableServer::Servant servant, - int &wait_occurred_restart_call); + bool &wait_occurred_restart_call); virtual PortableServer::ObjectId *system_id_to_object_id ( const PortableServer::ObjectId &system_id diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp index b71d5a08926..fb660291d17 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -173,7 +173,7 @@ namespace TAO TAO_Active_Object_Map_Entry *entry = 0; PortableServer::Servant servant = 0; - int result = + int const result = active_object_map_-> find_servant_using_system_id_and_user_id (system_id, user_id.in(), @@ -224,7 +224,7 @@ namespace TAO // associated with that object in the Active Object Map. PortableServer::Servant servant = 0; - int result = + int const result = this->active_object_map_->find_servant_using_user_id (id, servant); @@ -297,7 +297,7 @@ namespace TAO } TAO_Active_Object_Map_Entry *entry = 0; - int result = this->active_object_map_-> + int const result = this->active_object_map_-> find_servant_using_system_id_and_user_id (system_id, user_id.in(), servant, @@ -340,7 +340,7 @@ namespace TAO // POA invokes the appropriate method on the servant. PortableServer::Servant servant = 0; TAO_Active_Object_Map_Entry *active_object_map_entry = 0; - int result = this->active_object_map_-> + int const result = this->active_object_map_-> find_servant_using_system_id_and_user_id (system_id, user_id, servant, @@ -381,7 +381,7 @@ namespace TAO // POA invokes the appropriate method on the servant. PortableServer::Servant servant = 0; TAO_Active_Object_Map_Entry *active_object_map_entry = 0; - int result = this->active_object_map_-> + int const result = this->active_object_map_-> find_servant_using_system_id_and_user_id (system_id, user_id, servant, @@ -399,12 +399,12 @@ namespace TAO int ServantRetentionStrategyRetain::is_servant_in_map ( PortableServer::Servant servant, - int &wait_occurred_restart_call) + bool &wait_occurred_restart_call) { - int deactivated = 0; + bool deactivated = false; int servant_in_map = this->active_object_map_->is_servant_in_map (servant, - deactivated); + deactivated); if (!servant_in_map) { @@ -422,7 +422,7 @@ namespace TAO // state may change by the time we get the lock again. // Therefore, indicate to the caller that all conditions // need to be checked again. - wait_occurred_restart_call = 1; + wait_occurred_restart_call = true; ++this->waiting_servant_deactivation_; @@ -444,11 +444,11 @@ namespace TAO ServantRetentionStrategyRetain::is_user_id_in_map ( const PortableServer::ObjectId &id, CORBA::Short priority, - int &priorities_match, - int &wait_occurred_restart_call) + bool &priorities_match, + bool &wait_occurred_restart_call) { - int deactivated = 0; - int user_id_in_map = + bool deactivated = false; + bool user_id_in_map = this->active_object_map_->is_user_id_in_map (id, priority, priorities_match, @@ -779,7 +779,7 @@ namespace TAO ServantRetentionStrategyRetain::activate_object ( PortableServer::Servant servant, CORBA::Short priority, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, @@ -851,7 +851,7 @@ namespace TAO const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, @@ -876,8 +876,8 @@ namespace TAO // If the CORBA object denoted by the Object Id value is already // active in this POA (there is a servant bound to it in the Active // Object Map), the ObjectAlreadyActive exception is raised. - int priorities_match = 1; - int result = + bool priorities_match = true; + bool result = this->is_user_id_in_map (id, priority, priorities_match, @@ -910,7 +910,7 @@ namespace TAO CORBA::COMPLETED_NO)); } - bool may_activate = + bool const may_activate = this->poa_->is_servant_activation_allowed (servant, wait_occurred_restart_call); if (!may_activate) @@ -929,8 +929,8 @@ namespace TAO // association between the specified Object Id and the specified // servant in the Active Object Map. if (this->active_object_map_->bind_using_user_id (servant, - id, - priority) != 0) + id, + priority) != 0) { ACE_THROW (CORBA::OBJ_ADAPTER ()); } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index a82ba0aa20a..a34d82c52b0 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -41,13 +41,13 @@ namespace TAO virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL); virtual int is_servant_in_map (PortableServer::Servant servant, - int &wait_occurred_restart_call); + bool &wait_occurred_restart_call); virtual PortableServer::ObjectId * activate_object (PortableServer::Servant servant, CORBA::Short priority, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, @@ -59,7 +59,7 @@ namespace TAO activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, @@ -153,8 +153,8 @@ namespace TAO int is_user_id_in_map (const PortableServer::ObjectId &id, CORBA::Short priority, - int &priorities_match, - int &wait_occurred_restart_call); + bool &priorities_match, + bool &wait_occurred_restart_call); void deactivate_map_entry (TAO_Active_Object_Map_Entry *active_object_map_entry diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp index 9e5ef598e2b..8cf4469939e 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Servant_Upcall.cpp @@ -57,7 +57,7 @@ namespace TAO { while (1) { - int wait_occurred_restart_call = 0; + bool wait_occurred_restart_call = false; int result = this->prepare_for_upcall_i (key, @@ -90,7 +90,7 @@ namespace TAO const TAO::ObjectKey &key, const char *operation, CORBA::Object_out forward_to, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL) { // Acquire the object adapter lock first. diff --git a/TAO/tao/PortableServer/Servant_Upcall.h b/TAO/tao/PortableServer/Servant_Upcall.h index 427934e4faa..94b91f4368f 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.h +++ b/TAO/tao/PortableServer/Servant_Upcall.h @@ -107,7 +107,7 @@ namespace TAO int prepare_for_upcall_i (const TAO::ObjectKey &key, const char *operation, CORBA::Object_out forward_to, - int &wait_occurred_restart_call + bool &wait_occurred_restart_call ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Run pre_invoke for a remote request. |