From 4d214fb6e2c2c431e63438695220ab88325f9b1a Mon Sep 17 00:00:00 2001
From: terry-xiaoyu <506895667@qq.com>
Date: Fri, 20 Sep 2019 18:28:44 +0800
Subject: [PATCH] Fix session not saved after maybe_resume_session

---
 src/emqx_channel.erl                    | 2 +-
 test/emqx_msg_expiry_interval_SUITE.erl | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/emqx_channel.erl b/src/emqx_channel.erl
index 7d1fadb68..63bb55712 100644
--- a/src/emqx_channel.erl
+++ b/src/emqx_channel.erl
@@ -526,7 +526,7 @@ handle_out({connack, ?RC_SUCCESS, SP, ConnPkt},
                                         resuming = false,
                                         pendings = []},
             {ok, Packets, _} = handle_out({publish, Publishes}, Channel3),
-            {ok, [AckPacket|Packets], Channel2}
+            {ok, [AckPacket|Packets], Channel3}
     end;
 
 handle_out({connack, ReasonCode, _ConnPkt}, Channel = #channel{conninfo = ConnInfo,
diff --git a/test/emqx_msg_expiry_interval_SUITE.erl b/test/emqx_msg_expiry_interval_SUITE.erl
index 0da3efde1..6decab3bc 100644
--- a/test/emqx_msg_expiry_interval_SUITE.erl
+++ b/test/emqx_msg_expiry_interval_SUITE.erl
@@ -33,11 +33,13 @@ end_per_suite(_Config) ->
 
 t_message_expiry_interval_1(_) ->
 	ClientA = message_expiry_interval_init(),
-	[message_expiry_interval_exipred(ClientA, QoS) || QoS <- [0,1,2]].
+	[message_expiry_interval_exipred(ClientA, QoS) || QoS <- [0,1,2]],
+	emqtt:stop(ClientA).
 
 t_message_expiry_interval_2(_) ->
 	ClientA = message_expiry_interval_init(),
-	[message_expiry_interval_not_exipred(ClientA, QoS) || QoS <- [0,1,2]].
+	[message_expiry_interval_not_exipred(ClientA, QoS) || QoS <- [0,1,2]],
+	emqtt:stop(ClientA).
 
 message_expiry_interval_init() ->
 	{ok, ClientA} = emqtt:start_link([{proto_ver,v5}, {client_id, <<"client-a">>}, {clean_start, false},{properties, #{'Session-Expiry-Interval' => 360}}]),