summaryrefslogtreecommitdiff
path: root/ace
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2006-02-16 03:11:59 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2006-02-16 03:11:59 +0000
commitd85aaf6f633e217b69a886e84252cb23e625b83a (patch)
treec9a9ed1d2978dbea9c42ba71380008d6c6bf544d /ace
parentef9ab117eb9d35e7fc066e38458b791d554905b0 (diff)
downloadATCD-d85aaf6f633e217b69a886e84252cb23e625b83a.tar.gz
ChangeLogTag:Wed Feb 15 20:06:42 2006 Douglas C. Schmidt <schmidt@cse.wustl.edu>
Diffstat (limited to 'ace')
-rw-r--r--ace/Timer_Heap_T.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp
index cc57cdbf5d3..690bd0e9971 100644
--- a/ace/Timer_Heap_T.cpp
+++ b/ace/Timer_Heap_T.cpp
@@ -765,6 +765,11 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type,
number_of_cancellations++;
this->free_node (temp);
+
+ // We reset to zero so that we don't miss checking any nodes
+ // if a reheapify occurs when a node is removed. There
+ // may be a better fix than this, however.
+ i = 0;
}
else
i++;