From 4ad6ed1716dc917a0b80ddfbbefc43c734eeaab6 Mon Sep 17 00:00:00 2001
From: Hanoh Haim <hhaim@cisco.com>
Date: Wed, 2 Sep 2015 20:30:33 +0300
Subject: - fix valgrind gtest simulation errors - remove 32bit sim images for
 faster dev

---
 src/timer_wheel_pq.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/timer_wheel_pq.cpp')

diff --git a/src/timer_wheel_pq.cpp b/src/timer_wheel_pq.cpp
index 172d061e..bb480abd 100755
--- a/src/timer_wheel_pq.cpp
+++ b/src/timer_wheel_pq.cpp
@@ -169,11 +169,14 @@ bool CTimerWheel::handle(){
                 assert(timer->m_flow);
                 CFlowTimerHandle *	flow =timer->m_flow;
                 m_st_handle++;
+
+                timer->m_flow=0;/* stop the timer */
+                flow->m_timer=0;
+
                 if ( flow->m_callback ){
                     flow->m_callback(flow);
                 }
-                timer->m_flow=0;/* stop the timer */
-                flow->m_timer=0;
+
                 m_pq.pop();
                 m_st_free++;
                 delete timer;
-- 
cgit