From 47f5dcbbcd8d89810229a59573ac83fb175e018e Mon Sep 17 00:00:00 2001 From: Erik Date: Tue, 21 Apr 2015 12:03:48 -0400 Subject: [PATCH] style --- SocketIOClientSwift/SocketEngine.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SocketIOClientSwift/SocketEngine.swift b/SocketIOClientSwift/SocketEngine.swift index 4be2a87..20271e8 100644 --- a/SocketIOClientSwift/SocketEngine.swift +++ b/SocketIOClientSwift/SocketEngine.swift @@ -125,7 +125,9 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient { var byteArray = [UInt8](count: 1, repeatedValue: 0x0) byteArray[0] = 4 var mutData = NSMutableData(bytes: &byteArray, length: 1) + mutData.appendData(data) + return (mutData, nil) } else { var str = "b4" @@ -501,7 +503,8 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient { message.removeAtIndex(message.startIndex) let mesData = message.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)! - if let json = NSJSONSerialization.JSONObjectWithData(mesData, options: NSJSONReadingOptions.AllowFragments, + if let json = NSJSONSerialization.JSONObjectWithData(mesData, + options: NSJSONReadingOptions.AllowFragments, error: &err) as? NSDictionary, let sid = json["sid"] as? String { self.sid = sid self._connected = true