Fixed race condition while accessing state, updated code as per spec

ably · Dec 5, 2023 · 1b7a72d · 1b7a72d
1 parent e4ef0ce
commit 1b7a72d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/ably/proto_presence_message_test.go b/ably/proto_presence_message_test.go
@@ -1224,7 +1224,6 @@ func Test_internal_presencemap_RTP17(t *testing.T) {
 
 		in <- &ably.ProtocolMessage{
 			Action:  ably.ActionAttached,
-			Flags:   ably.FlagResumed,
 			Channel: channel.Name,
 		}
 

diff --git a/ably/realtime_channel.go b/ably/realtime_channel.go
@@ -797,10 +797,12 @@ func (c *RealtimeChannel) notify(msg *protocolMessage) {
 		if msg.Flags != 0 {
 			c.setModes(channelModeFromFlag(msg.Flags))
 		}
-		// RTL12
-		if c.state == ChannelStateAttached && !msg.Flags.Has(flagResumed) {
-			c.emitErrorUpdate(newErrorFromProto(msg.Error), false) // RTL12
-			c.Presence.onAttach(msg, false)
+
+		if c.State() == ChannelStateAttached {
+			if !msg.Flags.Has(flagResumed) { // RTL12
+				c.Presence.onAttach(msg, true)
+				c.emitErrorUpdate(newErrorFromProto(msg.Error), false)
+			}
 		} else {
 			c.Presence.onAttach(msg, true)
 			c.setState(ChannelStateAttached, newErrorFromProto(msg.Error), msg.Flags.Has(flagResumed))