Merge pull request sockjs#21 from rounce/dev

fix {odd_info,session_timeout}
nivertech · Apr 6, 2012 · f54c839 · f54c839
2 parents aea229d + 350900f
commit f54c839
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/src/sockjs_session.erl b/src/sockjs_session.erl
@@ -89,9 +89,16 @@ reply(SessionPid, Multiple) when is_pid(SessionPid) ->
 reply(SessionId, Multiple) ->
     reply(spid(SessionId), Multiple).
 
-
 %% --------------------------------------------------------------------------
 
+cancel_timer_safe(Timer, Atom) ->
+    case erlang:cancel_timer(Timer) of
+        false ->
+             receive Atom -> ok
+             after 0 -> ok end;
+        _ -> ok
+    end.
+
 spid(SessionId) ->
     case ets:lookup(?ETS, SessionId) of
         []          -> throw(no_session);
@@ -109,7 +116,7 @@ mark_waiting(Pid, State = #session{response_pid    = undefined,
                                    heartbeat_delay = HeartbeatDelay})
   when DisconnectTRef =/= undefined ->
     link(Pid),
-    _ =  erlang:cancel_timer(DisconnectTRef),
+    cancel_timer_safe(DisconnectTRef, session_timeout),
     TRef = erlang:send_after(HeartbeatDelay, self(), heartbeat_triggered),
     State#session{response_pid    = Pid,
                   disconnect_tref = undefined,
@@ -125,13 +132,7 @@ unmark_waiting(RPid, State = #session{response_pid     = RPid,
     _ = case HeartbeatTRef of
             undefined -> ok;
             triggered -> ok;
-            _Else     ->
-                case erlang:cancel_timer(HeartbeatTRef) of
-                    false ->
-                         receive heartbeat_triggered -> ok
-                         after 0 -> ok end;
-                    _ -> ok
-                end
+            _Else     -> cancel_timer_safe(HeartbeatTRef, heartbeat_triggered)
         end,
     TRef = erlang:send_after(DisconnectDelay, self(), session_timeout),
     State#session{response_pid    = undefined,
@@ -143,7 +144,7 @@ unmark_waiting(_Pid, State = #session{response_pid     = undefined,
                                       disconnect_tref  = DisconnectTRef,
                                       disconnect_delay = DisconnectDelay})
   when DisconnectTRef =/= undefined ->
-    _ = erlang:cancel_timer(DisconnectTRef),
+    cancel_timer_safe(DisconnectTRef, session_timeout),
     TRef = erlang:send_after(DisconnectDelay, self(), session_timeout),
     State#session{disconnect_tref = TRef};