From 03309ccd7c61c249144ecc1dc458e3e054367004 Mon Sep 17 00:00:00 2001
From: Tobias Lindahl <tobias@happihacking.com>
Date: Mon, 1 Nov 2021 10:28:39 +0100
Subject: [PATCH] refactor(persistent_session): clean up code in termination

---
 apps/emqx/src/emqx_channel.erl | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/emqx/src/emqx_channel.erl b/apps/emqx/src/emqx_channel.erl
index f8d634ba3..fc25490c4 100644
--- a/apps/emqx/src/emqx_channel.erl
+++ b/apps/emqx/src/emqx_channel.erl
@@ -1190,11 +1190,15 @@ terminate(Reason, Channel = #channel{will_msg = WillMsg}) ->
     run_terminate_hook(Reason, Channel).
 
 persist_if_session(#channel{session = Session} = Channel) ->
-    _ = [emqx_persistent_session:persist(Channel#channel.clientinfo,
-                                         Channel#channel.conninfo,
-                                         Channel#channel.session)
-         || emqx_session:is_session(Session)],
-    ok.
+    case emqx_session:is_session(Session) of
+        true ->
+            _ = emqx_persistent_session:persist(Channel#channel.clientinfo,
+                                                Channel#channel.conninfo,
+                                                Channel#channel.session),
+            ok;
+        false ->
+            ok
+    end.
 
 run_terminate_hook(_Reason, #channel{session = undefined}) -> ok;
 run_terminate_hook(Reason, #channel{clientinfo = ClientInfo, session = Session}) ->