Fixes race condition with auto-aubscribing

danielrhodes · Aug 27, 2016 · 4635ea3 · 4635ea3
1 parent 1115da7
commit 4635ea3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/Pod/Classes/ActionCableClient.swift b/Pod/Classes/ActionCableClient.swift
@@ -204,23 +204,23 @@ extension ActionCableClient {
     @warn_unused_result(message="You must hold on to the Channel returned from a create(_:)")
     public func create(name: String, identifier: ChannelIdentifier?, autoSubscribe: Bool=true, bufferActions: Bool=true) -> Channel {
         // Look in existing channels and return that
-        if let channel = channels[name] {
-            return channel
-        }
+        if let channel = channels[name] { return channel }
 
         // Look in unconfirmed channels and return that
-        if let channel = unconfirmedChannels[name] {
-            return channel
-        }
+        if let channel = unconfirmedChannels[name] { return channel }
 
         // Otherwise create a new one
         let channel = Channel(name: name,
             identifier: identifier,
             client: self,
             autoSubscribe: autoSubscribe,
             shouldBufferActions: bufferActions)
-        
+
         self.unconfirmedChannels[name] = channel
+
+        if (channel.autoSubscribe) {
+          subscribe(channel)
+        }
 
         return channel
     }
@@ -240,11 +240,12 @@ extension ActionCableClient {
 
     internal func subscribe(channel: Channel) {
         // Is it already added and subscribed?
-        if let existingChannel = channels[channel.name] where (existingChannel == channel) && (existingChannel.subscribed) {
+        if let existingChannel = channels[channel.name] where (existingChannel == channel) {
           return
         }
 
-        unconfirmedChannels.updateValue(channel, forKey: channel.name)
+        guard let channel = unconfirmedChannels[channel.name]
+          else { debugPrint("[ActionCableClient] Internal inconsistency error!"); return }
 
         do {
             try self.transmit(channel, command: Command.Subscribe, data: nil)

diff --git a/Pod/Classes/Channel.swift b/Pod/Classes/Channel.swift
@@ -87,10 +87,6 @@ public class Channel: Hashable, Equatable {
         self.autoSubscribe = autoSubscribe
         self.shouldBufferActions = shouldBufferActions
         self.identifier = identifier
-
-        if (self.autoSubscribe) {
-            subscribe()
-        }
     }
 
     public func onReceive(action:String, handler: (OnReceiveClosure)) -> Void {