1 files changed, 3 insertions, 2 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 a4ef1e7..a672010 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
@@ -236,7 +236,8 @@ public class ProtocolProviderServiceJabberImpl
      * @throws  OperationFailedException if login parameters
      *          as server port are not correct
      */
-    private void connectAndLogin(SecurityAuthority authority, int reasonCode)
+    private synchronized void connectAndLogin(SecurityAuthority authority,
+                                              int reasonCode)
         throws XMPPException, OperationFailedException
     {
         synchronized(initializationLock)
@@ -623,7 +624,7 @@ public class ProtocolProviderServiceJabberImpl
             //initialize the telephony opset
             String enableJingle = (String)JabberActivator
                 .getConfigurationService().getProperty(PNAME_ENABLE_JINGLE);
-            if( Boolean.getBoolean(enableJingle)    
+            if( Boolean.getBoolean(enableJingle)
                 && JabberActivator.getMediaService() != null)
             {
                 OperationSetBasicTelephony opSetBasicTelephony