diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-09-12 00:42:38 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-09-12 00:42:38 +0000 |
| commit | f58b4230ed804e8e474a9a10c1162fb766519569 (patch) | |
| tree | a5c6b535e156ee5c8d6bdf105b369520dafdf3e6 | |
| parent | 0449bc5f116ddb83b565464df31306f9c998a361 (diff) | |
| download | ATCD-f58b4230ed804e8e474a9a10c1162fb766519569.tar.gz | |
Minor changes
| -rw-r--r-- | TAO/tao/Leader_Follower.i | 14 | ||||
| -rw-r--r-- | TAO/tao/RTPortableServer/RT_Policy_Validator.cpp | 4 | ||||
| -rw-r--r-- | TAO/tests/RTCORBA/Collocation/Collocation.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/RTCORBA/Policy_Combinations/server.cpp | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/TAO/tao/Leader_Follower.i b/TAO/tao/Leader_Follower.i index 95cf6a6bb95..cdc68d7e7bd 100644 --- a/TAO/tao/Leader_Follower.i +++ b/TAO/tao/Leader_Follower.i @@ -30,6 +30,13 @@ TAO_Leader_Follower::follower_available (void) const return !this->follower_set_.empty (); } +ACE_INLINE void +TAO_Leader_Follower::no_leaders_available (void) +{ + if (this->new_leader_generator_) + this->new_leader_generator_->no_leaders_available (); +} + ACE_INLINE int TAO_Leader_Follower::elect_new_leader (void) { @@ -183,13 +190,6 @@ TAO_Leader_Follower::has_clients (void) const return this->clients_; } -ACE_INLINE void -TAO_Leader_Follower::no_leaders_available (void) -{ - if (this->new_leader_generator_) - this->new_leader_generator_->no_leaders_available (); -} - // **************************************************************** ACE_INLINE diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp index 1bace70d392..23115845489 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp @@ -272,8 +272,8 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies, return; // If this POA is using a thread pool with lanes, make sure we - // have at least one thread lane that corresponds to these - // each band. + // have at least one thread lane that can provide service for + // the specified SERVER_DECLARED priority. TAO_Thread_Lane **lanes = this->thread_pool_->lanes (); diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp index e955b2cde39..c07085133ac 100644 --- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp +++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp @@ -427,7 +427,7 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, CORBA::Policy_var priority_model_policy = this->rt_orb_->create_priority_model_policy (priority_model, - 0, + default_thread_priority, ACE_TRY_ENV); ACE_CHECK; diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp index 364144dad7f..f7e8a2d603e 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp @@ -485,7 +485,7 @@ server::test_no_bands_client_propagated_poa (CORBA::PolicyList &policies, policies.length (policies.length () + 1); policies[policies.length () - 1] = this->rt_orb_->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, - 0, + default_thread_priority, ACE_TRY_ENV); ACE_CHECK; @@ -622,7 +622,7 @@ server::test_no_bands_server_declared_poa (CORBA::PolicyList &policies, policies.length (policies.length () + 1); policies[policies.length () - 1] = this->rt_orb_->create_priority_model_policy (RTCORBA::SERVER_DECLARED, - 0, + default_thread_priority, ACE_TRY_ENV); ACE_CHECK; |