diff options
Diffstat (limited to 'TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp')
| -rw-r--r-- | TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp index ae04c2ae17c..503131137db 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -375,8 +375,7 @@ namespace TAO ++this->waiting_servant_deactivation_; - if (this->poa_->object_adapter ().enable_locking ()) - this->poa_->servant_deactivation_condition ().wait (); + this->poa_->servant_deactivation_condition ().wait (); --this->waiting_servant_deactivation_; @@ -423,8 +422,7 @@ namespace TAO ++this->waiting_servant_deactivation_; - if (this->poa_->object_adapter ().enable_locking ()) - this->poa_->servant_deactivation_condition ().wait (); + this->poa_->servant_deactivation_condition ().wait (); --this->waiting_servant_deactivation_; |