Some bugs regarding client disconnection patches

Author: Elad Zelingher

src/net45/WampSharp/WAMP2/V2/Api/CalleeProxy/WampCalleeClientProxyFactory.cs

@@ -26,11 +26,9 @@ private class ClientInvocationHandler : WampCalleeProxyInvocationHandler
             private readonly IWampRpcOperationCatalogProxy mCatalogProxy;
             private readonly IWampClientConnectionMonitor mMonitor;
 
-            private readonly TaskCompletionSource<object> mDisconnectionTaskCompletionSource =
-                new TaskCompletionSource<object>();
-            
-            private readonly ManualResetEvent mDisconnectionWaitHandle =
-                new ManualResetEvent(false);
+            private TaskCompletionSource<object> mDisconnectionTaskCompletionSource;
+
+            private ManualResetEvent mDisconnectionWaitHandle;
 
             private Exception mDisconnectionException;
             private readonly CallOptions mEmptyOptions = new CallOptions();
@@ -44,7 +42,10 @@ public ClientInvocationHandler(IWampRpcOperationCatalogProxy catalogProxy,
             {
                 mCatalogProxy = catalogProxy;
                 mMonitor = monitor;
+                mDisconnectionTaskCompletionSource = new TaskCompletionSource<object>();
+                mDisconnectionWaitHandle = new ManualResetEvent(false);                
 
+                mMonitor.ConnectionEstablished += OnConnectionEstablished;
                 mMonitor.ConnectionError += OnConnectionError;
                 mMonitor.ConnectionBroken += OnConnectionBroken;
             }
@@ -53,6 +54,12 @@ public ClientInvocationHandler(IWampRpcOperationCatalogProxy catalogProxy,
 
             #region Private Methods
 
+            private void OnConnectionEstablished(object sender, WampSessionEventArgs e)
+            {
+                mDisconnectionTaskCompletionSource = new TaskCompletionSource<object>();
+                mDisconnectionWaitHandle = new ManualResetEvent(false);                
+            }
+
             private void OnConnectionBroken(object sender, WampSessionCloseEventArgs e)
             {
                 Exception exception = new WampConnectionBrokenException(e);
@@ -68,7 +75,7 @@ private void OnConnectionError(object sender, WampConnectionErrorEventArgs e)
             private void SetException(Exception exception)
             {
                 mDisconnectionException = exception;
-                mDisconnectionTaskCompletionSource.SetException(exception);
+                mDisconnectionTaskCompletionSource.TrySetException(exception);
                 mDisconnectionWaitHandle.Set();
             }
 

src/net45/WampSharp/WAMP2/V2/Client/PubSub/WampPublisher.cs

@@ -54,6 +54,8 @@ public WampPublisher(IWampServerProxy proxy, IWampFormatter<TMessage> formatter,
 
             long requestId = mPendingPublication.Add(publication);
 
+            publication.RequestId = requestId;
+
             publicationAction(requestId);
 
             bool acknowledge = options.Acknowledge ?? false;