[smuxi: 3/4] Engine-XMPP: fixed deadlock in Dispose() (closes: #934)



commit 465b68f957a8ad0cca87d468c3d43cb8b20fd2b7
Author: Mirco Bauer <meebey meebey net>
Date:   Sat Jan 31 00:27:39 2015 +0100

    Engine-XMPP: fixed deadlock in Dispose() (closes: #934)

 .../Protocols/Xmpp/XmppProtocolManager.cs          |   13 -------------
 1 files changed, 0 insertions(+), 13 deletions(-)
---
diff --git a/src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs 
b/src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs
index 47c51aa..ef2399f 100644
--- a/src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs
+++ b/src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs
@@ -310,7 +310,6 @@ namespace Smuxi.Engine
             JabberClient.Close();
         }
 
-        [MethodImpl(MethodImplOptions.Synchronized)]
         public override void Dispose()
         {
             Trace.Call();
@@ -318,18 +317,6 @@ namespace Smuxi.Engine
 
             base.Dispose();
             AutoReconnect = false;
-            JabberClient.OnMessage -= OnMessage;
-            JabberClient.OnClose -= OnClose;
-            JabberClient.OnLogin -= OnLogin;
-            JabberClient.OnError -= OnError;
-            JabberClient.OnStreamError -= OnStreamError;
-            JabberClient.OnPresence -= OnPresence;
-            JabberClient.OnRosterItem -= OnRosterItem;
-            JabberClient.OnReadXml -= OnReadXml;
-            JabberClient.OnWriteXml -= OnWriteXml;
-            JabberClient.OnAuthError -= OnAuthError;
-            JabberClient.ClientSocket.OnValidateCertificate -= ValidateCertificate;
-            JabberClient.SendingServiceUnavailable -= OnSendingServiceUnavailable;
             JabberClient.SocketDisconnect();
         }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]