* src/ejabberd_s2s_out.erl: Bounce packets after unregistering s2s

connection, not before

SVN Revision: 811

diff --git a/ChangeLog b/ChangeLog
index ed5c89eea1b72d7c9e529a8de3934cb014981fac..5347c5d5c11256fb8fa72d3dcafe350c4f22627d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-11  Alexey Shchepin  <alexey@sevcom.net>
+
+       * src/ejabberd_s2s_out.erl: Bounce packets after unregistering s2s
+       connection, not before
+
 2007-07-11  Mickael Remond  <mickael.remond@process-one.net>
 
        * src/mod_echo.erl: mod_echo does not reply to other

diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index d095393b5d03420c11c286d0b8c96fad3acc457f..2189a419d230ac7cd3ce83438d480f027fc0f7ff 100644 (file)
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -3,7 +3,6 @@
 %%% Author  : Alexey Shchepin <alexey@sevcom.net>
 %%% Purpose : 
 %%% Created :  6 Dec 2002 by Alexey Shchepin <alexey@sevcom.net>
-%%% Id      : $Id$
 %%%----------------------------------------------------------------------
 
 -module(ejabberd_s2s_out).
@@ -653,7 +652,6 @@ handle_info(_, StateName, StateData) ->
 %%----------------------------------------------------------------------
 terminate(Reason, StateName, StateData) ->
     ?INFO_MSG("terminated: ~p", [Reason]),
-    bounce_queue(StateData#state.queue, ?ERR_REMOTE_SERVER_NOT_FOUND),
     case StateData#state.new of
        false ->
            ok;
@@ -661,6 +659,7 @@ terminate(Reason, StateName, StateData) ->
            ejabberd_s2s:remove_connection({StateData#state.myname,
                                            StateData#state.server})
     end,
+    bounce_queue(StateData#state.queue, ?ERR_REMOTE_SERVER_NOT_FOUND),
     case StateData#state.socket of
        undefined ->
            ok;