From f9221e221238660b694f2f3721c36f7dc7adbd19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?= Date: Wed, 1 Aug 2007 11:25:23 +0000 Subject: [PATCH] * src/ejabberd_s2s_out.erl: Avoid bouncing messages twice if terminate happens during open_connect. SVN Revision: 854 --- ChangeLog | 3 +++ src/ejabberd_s2s_out.erl | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e7b08cdbd..8fcc28b90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-08-01 Mickael Remond + * src/ejabberd_s2s_out.erl: Avoid bouncing messages twice if + terminate happens during open_connect. + * src/ejabberd_s2s_out.erl: On terminate, bounce internal process queue and Erlang message queue. diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index 1a644124b..363f03120 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -181,8 +181,6 @@ open_socket(init, StateData) -> Version])), {next_state, wait_for_stream, NewStateData}; {error, _Reason} -> - Error = ?ERR_REMOTE_SERVER_NOT_FOUND, - bounce_messages(Error), {stop, normal, StateData} end; open_socket(stop, StateData) ->