aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2012-11-26 11:50:27 +0100
committerBjörn Gustavsson <[email protected]>2012-11-26 11:50:27 +0100
commitb4db457fdf813de7046056a0cf71ec104af8b871 (patch)
tree1b330f779503d502178f57bce1652bf23e72be17
parent073b4404714d31aff96a46419ecd34c018da5bab (diff)
parent011bb8a503c7ff967996c32a656d3e6436d017f7 (diff)
downloadotp-b4db457fdf813de7046056a0cf71ec104af8b871.tar.gz
otp-b4db457fdf813de7046056a0cf71ec104af8b871.tar.bz2
otp-b4db457fdf813de7046056a0cf71ec104af8b871.zip
Merge branch 'bjorn/ct/separate-io-server/OTP-10101'
* bjorn/ct/separate-io-server/OTP-10101: Fix race condition in test_server_io
-rw-r--r--lib/test_server/src/test_server_io.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/test_server/src/test_server_io.erl b/lib/test_server/src/test_server_io.erl
index e960b3087a..777b377201 100644
--- a/lib/test_server/src/test_server_io.erl
+++ b/lib/test_server/src/test_server_io.erl
@@ -307,8 +307,10 @@ do_print_buffered(Q0, St) ->
gc(#st{gls=Gls0}) ->
InUse0 = [begin
- {group_leader,GL} = process_info(P, group_leader),
- GL
+ case process_info(P, group_leader) of
+ {group_leader,GL} -> GL;
+ undefined -> undefined
+ end
end || P <- processes()],
InUse = ordsets:from_list(InUse0),
Gls = gb_sets:to_list(Gls0),