diff options
| author | Niclas Eklund <[email protected]> | 2010-05-26 14:38:02 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-05-26 14:38:02 +0000 |
| commit | 4aa5dadc3b966cffc2ffcaadf1b132f276afe75a (patch) | |
| tree | c001ec03c821df005eafd3210b9098e0c3d4ff4c /lib/ssh/src/ssh_connection_controler.erl | |
| parent | 64943ba9de7ce7fa0ed75f9a6c3e7c472a07b8e0 (diff) | |
| download | otp-4aa5dadc3b966cffc2ffcaadf1b132f276afe75a.tar.gz otp-4aa5dadc3b966cffc2ffcaadf1b132f276afe75a.tar.bz2 otp-4aa5dadc3b966cffc2ffcaadf1b132f276afe75a.zip | |
Fix race condition when an other connection is started before a channel is opened in the first connection.
Diffstat (limited to 'lib/ssh/src/ssh_connection_controler.erl')
| -rw-r--r-- | lib/ssh/src/ssh_connection_controler.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_connection_controler.erl b/lib/ssh/src/ssh_connection_controler.erl index 990541f8d6..636ecba532 100644 --- a/lib/ssh/src/ssh_connection_controler.erl +++ b/lib/ssh/src/ssh_connection_controler.erl @@ -99,8 +99,8 @@ terminate(_Reason, #state{}) -> handle_call({handler, Pid, [Role, Socket, Opts]}, _From, State) -> {ok, Handler} = ssh_connection_handler:start_link(Role, Pid, Socket, Opts), {reply, {ok, Handler}, State#state{handler = Handler}}; -handle_call({manager, [server = Role, Socket, Opts]}, _From, State) -> - {ok, Manager} = ssh_connection_manager:start_link([Role, Socket, Opts]), +handle_call({manager, [server = Role, Socket, Opts, SubSysSup]}, _From, State) -> + {ok, Manager} = ssh_connection_manager:start_link([Role, Socket, Opts, SubSysSup]), {reply, {ok, Manager}, State#state{manager = Manager}}; handle_call({manager, [client = Role | Opts]}, _From, State) -> {ok, Manager} = ssh_connection_manager:start_link([Role, Opts]), |