aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-04-15 10:32:15 +0200
committerIngela Anderton Andin <[email protected]>2014-02-05 10:32:23 +0100
commit1cce96320d8e56dba2bf2357eef5a23f9bca1fa7 (patch)
tree1a93d379e61a3a05a3c9b934ede6051d0937dbc6 /lib
parent808502d8122a7e5c136f2e0079db68af5690e959 (diff)
downloadotp-1cce96320d8e56dba2bf2357eef5a23f9bca1fa7.tar.gz
otp-1cce96320d8e56dba2bf2357eef5a23f9bca1fa7.tar.bz2
otp-1cce96320d8e56dba2bf2357eef5a23f9bca1fa7.zip
inets: stop block timer with the right arguments
Diffstat (limited to 'lib')
-rw-r--r--lib/inets/src/http_server/httpd_manager.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/src/http_server/httpd_manager.erl b/lib/inets/src/http_server/httpd_manager.erl
index 524e579ec0..3a486614b8 100644
--- a/lib/inets/src/http_server/httpd_manager.erl
+++ b/lib/inets/src/http_server/httpd_manager.erl
@@ -662,11 +662,11 @@ handle_unblock(S, FromA) ->
handle_unblock(S, _FromA, unblocked) ->
{ok,S};
handle_unblock(S, FromA, _AdminState) ->
- stop_block_tmr(S#state.blocking_tmr),
case S#state.blocking_tmr of
- {_Tmr,FromB,Ref} ->
+ {Tmr,FromB,Ref} ->
%% Another process is trying to unblock
%% Inform the blocker
+ stop_block_tmr(Tmr),
FromB ! {block_reply, {error,{unblocked,FromA}},Ref};
_ ->
ok