diff options
| author | Henrik Nord <[email protected]> | 2013-11-29 11:38:20 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2013-11-29 11:38:20 +0100 |
| commit | 0b5ac8b3433ff05728d087b15666457ba27d1f32 (patch) | |
| tree | cbbb5ac837e146bf01e9d2611437fd4709840d37 /lib/common_test/src | |
| parent | 670150ff9bfdce856c327fb76c30e58039df2cba (diff) | |
| parent | b1309987eb47a009d2bfaa8f81e2f600090500a4 (diff) | |
| download | otp-0b5ac8b3433ff05728d087b15666457ba27d1f32.tar.gz otp-0b5ac8b3433ff05728d087b15666457ba27d1f32.tar.bz2 otp-0b5ac8b3433ff05728d087b15666457ba27d1f32.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src')
| -rw-r--r-- | lib/common_test/src/ct_netconfc.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl index 7f10e1db09..64fe8b4bb0 100644 --- a/lib/common_test/src/ct_netconfc.erl +++ b/lib/common_test/src/ct_netconfc.erl @@ -1129,10 +1129,14 @@ handle_msg({Ref,timeout}, ct_gen_conn:return(Caller,{error,{hello_session_failed,timeout}}), {stop,State#state{hello_status={error,timeout}}}; handle_msg({Ref,timeout},#state{pending=Pending} = State) -> - {value,#pending{caller=Caller},Pending1} = + {value,#pending{op=Op,caller=Caller},Pending1} = lists:keytake(Ref,#pending.ref,Pending), ct_gen_conn:return(Caller,{error,timeout}), - {noreply,State#state{pending=Pending1}}. + R = case Op of + close_session -> stop; + _ -> noreply + end, + {R,State#state{pending=Pending1}}. %% @private %% Called by ct_util_server to close registered connections before terminate. |