From dc9f8e3bdc7cdddf8a371f9b98a4fa0f8bb2df33 Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Sun, 2 Oct 2011 07:38:03 +0000 Subject: [PATCH] Fixes a problem with jabber accounts where canceled certificate verification will lead to keep trying connecting with all other discovered servers till approved, reported by Ingo. --- .../jabber/ProtocolProviderServiceJabberImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 467f3915e..a0cec28e5 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java @@ -919,6 +919,14 @@ private ConnectState connectAndLogin( connection.connect(); + if(abortConnecting) + { + abortConnecting = false; + disconnectAndCleanConnection(); + + return ConnectState.ABORT_CONNECTING; + } + registerServiceDiscoveryManager(); if(connectionListener == null)