aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2014-05-26 12:20:30 +0200
committerDan Gudmundsson <[email protected]>2014-05-26 12:20:30 +0200
commitce2ea545b8833b8e31322cdcff82f14a9cad8ba8 (patch)
treed7985fcaa95db2693c92d4ae6f75d26f518ab0b9
parenteaac822f90339641de997062420dd3f458710896 (diff)
parentba6b3c236c690f478d274bfd678cb8b3cec97c52 (diff)
downloadotp-ce2ea545b8833b8e31322cdcff82f14a9cad8ba8.tar.gz
otp-ce2ea545b8833b8e31322cdcff82f14a9cad8ba8.tar.bz2
otp-ce2ea545b8833b8e31322cdcff82f14a9cad8ba8.zip
Merge branch 'dgud/mnesia/timing-issue' into maint
* dgud/mnesia/timing-issue: mnesia: Fix timing issue
-rw-r--r--lib/mnesia/src/mnesia_locker.erl9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/mnesia/src/mnesia_locker.erl b/lib/mnesia/src/mnesia_locker.erl
index 81b435c6dc..c3846b00c0 100644
--- a/lib/mnesia/src/mnesia_locker.erl
+++ b/lib/mnesia/src/mnesia_locker.erl
@@ -131,9 +131,14 @@ send_release_tid(Nodes, Tid) ->
receive_release_tid_acc([Node | Nodes], Tid) ->
receive
{?MODULE, Node, {tid_released, Tid}} ->
- receive_release_tid_acc(Nodes, Tid);
- {mnesia_down, Node} ->
receive_release_tid_acc(Nodes, Tid)
+ after 0 ->
+ receive
+ {?MODULE, Node, {tid_released, Tid}} ->
+ receive_release_tid_acc(Nodes, Tid);
+ {mnesia_down, Node} ->
+ receive_release_tid_acc(Nodes, Tid)
+ end
end;
receive_release_tid_acc([], _Tid) ->
ok.