From 227f8c74b1dec197b832d045361495b84c492845 Mon Sep 17 00:00:00 2001
From: zhouzb <zhouzb@emqx.io>
Date: Fri, 17 Jan 2020 10:11:38 +0800
Subject: [PATCH] Fix bad setting

---
 src/emqx_session.erl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/emqx_session.erl b/src/emqx_session.erl
index f4b906e39..2b03b7868 100644
--- a/src/emqx_session.erl
+++ b/src/emqx_session.erl
@@ -518,10 +518,10 @@ enrich_subopts([{qos, SubQoS}|Opts], Msg = #message{qos = PubQoS},
     enrich_subopts(Opts, Msg#message{qos = min(SubQoS, PubQoS)}, Session);
 enrich_subopts([{rap, 1}|Opts], Msg, Session) ->
     enrich_subopts(Opts, Msg, Session);
-enrich_subopts([{rap, 0}|Opts], Msg = #message{headers = #{retained := true}}, Session = #session{}) ->
+enrich_subopts([{rap, 0}|Opts], Msg = #message{headers = #{retained := true}}, Session) ->
     enrich_subopts(Opts, Msg, Session);
-enrich_subopts([{rap, 0}|Opts], Msg = #message{flags = Flags}, Session) ->
-    enrich_subopts(Opts, Msg#message{flags = maps:put(retain, false, Flags)}, Session);
+enrich_subopts([{rap, 0}|Opts], Msg, Session) ->
+    enrich_subopts(Opts, emqx_message:set_flag(retain, false, Msg), Session);
 enrich_subopts([{subid, SubId}|Opts], Msg, Session) ->
     Msg1 = emqx_message:set_header('Subscription-Identifier', SubId, Msg),
     enrich_subopts(Opts, Msg1, Session).