Setting GOODBYE message on disconnection

Author: darkl

src/net45/WampSharp/WAMP2/V2/Client/Session/WampSessionClient.cs

@@ -17,6 +17,7 @@ public class WampSessionClient<TMessage> : IWampSessionClientExtended,
         private readonly IWampServerProxy mServerProxy;
         private TaskCompletionSource<bool> mOpenTask = new TaskCompletionSource<bool>();
         private TaskCompletionSource<GoodbyeMessage> mCloseTask;
+        private GoodbyeMessage mGoodbyeMessage;
         private readonly IWampFormatter<TMessage> mFormatter;
         private bool mGoodbyeSent;
 		private readonly IWampClientAuthenticator mAuthenticator;
@@ -117,8 +118,7 @@ public void Goodbye(GoodbyeDetails details, string reason)
                 }
                 else
                 {
-                    GoodbyeMessage message = new GoodbyeMessage(){Details = details, Reason = reason};
-                    mCloseTask?.SetResult(message);
+                    mGoodbyeMessage = new GoodbyeMessage(){Details = details, Reason = reason};
                 }
             }
 
@@ -131,12 +131,21 @@ private void RaiseConnectionBroken()
 
             WampSessionCloseEventArgs closeEventArgs = mCloseEventArgs;
 
+            Interlocked.CompareExchange(ref mIsConnected, 0, 1);
+
+            GoodbyeMessage goodbyeMessage = mGoodbyeMessage;
+
+            if (goodbyeMessage != null)
+            {
+                mCloseTask?.SetResult(goodbyeMessage);
+            }
+
             SetTasksErrorsIfNeeded(new WampConnectionBrokenException(mCloseEventArgs));
 
-            Interlocked.CompareExchange(ref mIsConnected, 0, 1);
             mOpenTask = new TaskCompletionSource<bool>();
             mCloseTask = null;
             mCloseEventArgs = null;
+            mGoodbyeMessage = null;
 
             OnConnectionBroken(closeEventArgs);
         }