From 907878081d512a8f00a23946c3f476bd974eabcb Mon Sep 17 00:00:00 2001
From: Alexey Shchepin <alexey@process-one.net>
Date: Wed, 11 Jul 2007 14:10:28 +0000
Subject: [PATCH] * src/ejabberd_s2s_out.erl: Bounce packets after
 unregistering s2s connection, not before

SVN Revision: 811
---
 ChangeLog                | 5 +++++
 src/ejabberd_s2s_out.erl | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed5c89eea..5347c5d5c 100644
--- 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 d095393b5..2189a419d 100644
--- 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;