Fixes #1000

couchbase · Apr 18, 2018 · fe1c302 · fe1c302
1 parent f122902
commit fe1c302
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/src/Couchbase.Lite.Shared/Sync/WebSocketWrapper.cs b/src/Couchbase.Lite.Shared/Sync/WebSocketWrapper.cs
@@ -199,14 +199,19 @@ public void Start()
                 // STEP 2: Open the socket connection to the remote host
                 var cts = new CancellationTokenSource();
                 cts.CancelAfter(ConnectTimeout);
-                _client.ConnectAsync(_logic.UrlRequest.Host, _logic.UrlRequest.Port).ContinueWith(t =>
-                {
-                    if (!NetworkTaskSuccessful(t)) {
-                        return;
-                    }
+                try {
+                    _client.ConnectAsync(_logic.UrlRequest.Host, _logic.UrlRequest.Port).ContinueWith(t =>
+                    {
+                        if (!NetworkTaskSuccessful(t)) {
+                            return;
+                        }
 
-                    _queue.DispatchAsync(StartInternal);
-                }, cts.Token);
+                        _queue.DispatchAsync(StartInternal);
+                    }, cts.Token);
+                } catch (Exception e) {
+                    // Yes, unfortunately exceptions can either be thrown here or in the task...
+                    DidClose(e);
+                }
             });
         }