Fix a nasty issue of replications all ending in crashes due to not im…

…plementing the native disposal method
couchbase · Jan 31, 2018 · cc0ab52 · cc0ab52
1 parent 45079f0
commit cc0ab52
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/Couchbase.Lite/Sync/WebSocketTransport.cs b/src/Couchbase.Lite/Sync/WebSocketTransport.cs
@@ -50,7 +50,7 @@ internal static unsafe class WebSocketTransport
 
         public static void RegisterWithC4()
         {
-            SocketFactory.RegisterFactory(DoOpen, DoClose, DoWrite, DoCompleteReceive);
+            SocketFactory.RegisterFactory(DoOpen, DoClose, DoWrite, DoCompleteReceive, DoDispose);
             SocketFactory.SetErrorHandler(DoError);
         }
 
@@ -84,6 +84,17 @@ private static void DoCompleteReceive(C4Socket* socket, ulong bytecount)
             socketWrapper.CompletedReceive(bytecount);
         }
 
+        private static void DoDispose(C4Socket* socket)
+        {
+            var id = (int) socket->nativeHandle;
+            if (id == 0) {
+                Log.To.Sync.E(Tag, "DoDispose reached after close");
+                return;
+            }
+
+            Sockets.Remove(id);
+        }
+
         private static void DoError(C4Socket* socket, Exception e)
         {
             Log.To.Sync.E(Tag, "Websocket Error", e);

diff --git a/vendor/couchbase-lite-core b/vendor/couchbase-lite-core