From 838dade0fa2294acce9441ce70dcbb9c5f6ea6a4 Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 3 Apr 2015 16:18:15 -0400 Subject: [PATCH] Fix messages getting stuck in post --- SwiftIO/SocketEngine.swift | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/SwiftIO/SocketEngine.swift b/SwiftIO/SocketEngine.swift index 3f28d4a..dae5a05 100644 --- a/SwiftIO/SocketEngine.swift +++ b/SwiftIO/SocketEngine.swift @@ -171,14 +171,12 @@ public class SocketEngine: NSObject, WebSocketDelegate { } private func doFastUpgrade() { - dispatch_async(self.emitQueue) {[weak self] in - self?.sendWebSocketMessage("", withType: PacketType.UPGRADE) - self?._websocket = true - self?._polling = false - self?.fastUpgrade = false - self?.probing = false - self?.flushProbeWait() - } + self.sendWebSocketMessage("", withType: PacketType.UPGRADE) + self._websocket = true + self._polling = false + self.fastUpgrade = false + self.probing = false + self.flushProbeWait() } private func doPoll() { @@ -243,7 +241,10 @@ public class SocketEngine: NSObject, WebSocketDelegate { } self?.probeWait.removeAll(keepCapacity: false) - // NSLog("waiting for post after flush probe: \(self!.postWait.count)") + + if self?.postWait.count != 0 { + self?.flushWaitingForPostToWebSocket() + } } }