Prevent deadlock if a XMPP certificate validation fails

1 files changed, 10 insertions, 1 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
index b664ec2..d74c07e 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
@@ -2433,10 +2433,19 @@ public class ProtocolProviderServiceJabberImpl
             }

             catch(CertificateException e)

             {

-                fireRegistrationStateChanged(getRegistrationState(),

+                // notify in a separate thread to avoid a deadlock when a

+                // reg state listener accesses a synchronized XMPPConnection

+                // method (like getRoster)

+                new Thread(new Runnable()

+                {

+                    public void run()

+                    {

+                        fireRegistrationStateChanged(getRegistrationState(),

                             RegistrationState.UNREGISTERED,

                             RegistrationStateChangeEvent.REASON_USER_REQUEST,

                             "Not trusted certificate");

+                    }

+                }).start();

                 throw e;

             }