From 0ebbf3f0cd375c50f2a0b6e206639d60ae514301 Mon Sep 17 00:00:00 2001
From: Erik <nuclear.ace@gmail.com>
Date: Thu, 24 Sep 2015 15:01:06 -0400
Subject: [PATCH] Don't need optionals here

---
 SocketIOClientSwift/SocketEngine.swift | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/SocketIOClientSwift/SocketEngine.swift b/SocketIOClientSwift/SocketEngine.swift
index ebc4aad..a466083 100644
--- a/SocketIOClientSwift/SocketEngine.swift
+++ b/SocketIOClientSwift/SocketEngine.swift
@@ -65,8 +65,9 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
     var cookies: [NSHTTPCookie]?
     var sid = ""
     var socketPath = ""
-    var urlPolling: String?
-    var urlWebSocket: String?
+    var urlPolling = ""
+    var urlWebSocket = ""
+
     var ws: WebSocket?
     
     @objc public enum PacketType: Int {
@@ -147,13 +148,12 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
         }
     }
 
-    private func createURLs(params: [String: AnyObject]?) -> (String?, String?) {
+    private func createURLs(params: [String: AnyObject]?) -> (String, String) {
         if client == nil {
-            return (nil, nil)
+            return ("", "")
         }
 
         let path = socketPath == "" ? "/socket.io" : socketPath
-
         let url = "\(client!.socketURL)\(path)/?transport="
         var urlPolling: String
         var urlWebSocket: String
@@ -189,7 +189,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
     }
 
     private func createWebsocket(andConnect connect: Bool) {
-        let wsUrl = urlWebSocket! + (sid == "" ? "" : "&sid=\(sid)")
+        let wsUrl = urlWebSocket + (sid == "" ? "" : "&sid=\(sid)")
         
         ws = WebSocket(url: NSURL(string: wsUrl)!,
             cookies: cookies)
@@ -228,7 +228,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
         }
 
         waitingForPoll = true
-        let req = NSMutableURLRequest(URL: NSURL(string: urlPolling! + "&sid=\(sid)&b64=1")!)
+        let req = NSMutableURLRequest(URL: NSURL(string: urlPolling + "&sid=\(sid)&b64=1")!)
 
         if cookies != nil {
             let headers = NSHTTPCookie.requestHeaderFieldsWithCookies(cookies!)
@@ -318,7 +318,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
 
         postWait.removeAll(keepCapacity: false)
 
-        let req = NSMutableURLRequest(URL: NSURL(string: urlPolling! + "&sid=\(sid)")!)
+        let req = NSMutableURLRequest(URL: NSURL(string: urlPolling + "&sid=\(sid)")!)
 
         if let cookies = cookies {
             let headers = NSHTTPCookie.requestHeaderFieldsWithCookies(cookies)
@@ -468,7 +468,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
             return
         }
 
-        let reqPolling = NSMutableURLRequest(URL: NSURL(string: urlPolling! + "&b64=1")!)
+        let reqPolling = NSMutableURLRequest(URL: NSURL(string: urlPolling + "&b64=1")!)
 
         if cookies != nil {
             let headers = NSHTTPCookie.requestHeaderFieldsWithCookies(cookies!)