From c5e99801c978e18aa0f684ceacfec3d5cc7d4794 Mon Sep 17 00:00:00 2001 From: Jiyong Huang Date: Mon, 2 Dec 2024 10:01:44 +0800 Subject: [PATCH] fix(mqtt): conn subs npe Signed-off-by: Jiyong Huang --- internal/io/mqtt/conn.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/internal/io/mqtt/conn.go b/internal/io/mqtt/conn.go index 69a8c905a7..e00ea97862 100644 --- a/internal/io/mqtt/conn.go +++ b/internal/io/mqtt/conn.go @@ -37,12 +37,12 @@ type Connection struct { status atomic.Value scHandler api.StatusChangeHandler // key is the topic. Each topic will have only one connector map[string]*client.SubscriptionInfo - subscriptions *sync.Map + subscriptions sync.Map } func CreateConnection(_ api.StreamContext) modules.Connection { return &Connection{ - subscriptions: new(sync.Map), + subscriptions: sync.Map{}, } } @@ -155,9 +155,7 @@ func (conn *Connection) DetachSub(ctx api.StreamContext, props map[string]any) { ctx.GetLogger().Warnf("cannot find topic to unsub: %v", props) return } - if conn.subscriptions != nil { - conn.subscriptions.Delete(topic) - } + conn.subscriptions.Delete(topic) if conn.Client != nil { err = conn.Client.Unsubscribe(ctx, topic) if err != nil {