summaryrefslogtreecommitdiff
path: root/ace/Timer_Wheel_T.cpp
diff options
context:
space:
mode:
authorbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-06-16 15:48:45 +0000
committerbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-06-16 15:48:45 +0000
commit821e074306c8771f3f2dc4d2568f4b71f5039be0 (patch)
tree48df225995a30a7eb9a6b95cfb7127615dc32e8a /ace/Timer_Wheel_T.cpp
parentf8cf24ca7cdb225ce6ffac35d28cd14be2a1dc0b (diff)
downloadATCD-821e074306c8771f3f2dc4d2568f4b71f5039be0.tar.gz
Fixed Bug in Expire
Diffstat (limited to 'ace/Timer_Wheel_T.cpp')
-rw-r--r--ace/Timer_Wheel_T.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/ace/Timer_Wheel_T.cpp b/ace/Timer_Wheel_T.cpp
index 547d586908f..001cafb226e 100644
--- a/ace/Timer_Wheel_T.cpp
+++ b/ace/Timer_Wheel_T.cpp
@@ -506,15 +506,15 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, LOCK>::expire (const ACE_Time_Value &cur_time)
for (i = 0; i < this->wheel_size_; i++)
{
if (this->wheel_[i]->get_next () != this->wheel_[i]
- && this->wheel_[i]->get_next ()->get_timer_value () < earliest_time)
+ && this->wheel_[i]->get_next ()->get_timer_value () <= earliest_time)
{
earliest = i;
earliest_time = this->wheel_[i]->get_next ()->get_timer_value ();
}
}
- // Check to see if there is anything to expire
- if (this->wheel_[earliest]->get_next ()->get_timer_value () > cur_time)
+ // Check to see if there is nothing to expire
+ if (earliest == this->wheel_size_)
return 0;
do