aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-04-18 10:23:36 +0200
committerFredrik Gustafsson <[email protected]>2013-04-18 10:23:36 +0200
commita504d4abc5074f43b37a8a7c187f04fa82f29323 (patch)
treed7bca9bc2b81ebec4c1c27086b85e7310c7649e7 /lib
parentabf2f3c8042becaec9ff2eceb95ac54d95216b54 (diff)
parentcec440ee7256741b61eaa32403db2989dcc23724 (diff)
downloadotp-a504d4abc5074f43b37a8a7c187f04fa82f29323.tar.gz
otp-a504d4abc5074f43b37a8a7c187f04fa82f29323.tar.bz2
otp-a504d4abc5074f43b37a8a7c187f04fa82f29323.zip
Merge branch 'fredrik/inets/unblock_timer' into maint
* fredrik/inets/unblock_timer: 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 672a70a394..c83d06a158 100644
--- a/lib/inets/src/http_server/httpd_manager.erl
+++ b/lib/inets/src/http_server/httpd_manager.erl
@@ -691,11 +691,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