Fixes a deadlock reported against WASAPI which leads to inability to make calls.

src/net/java/sip/communicator/impl/protocol/sip/CallSipImpl.java

@@ -80,8 +80,7 @@ public class CallSipImpl
     * The amount of time (in milliseconds) for the initial interval for
     * retransmissions of response 180.
     */
-    private int retransmitsRingingInterval
-        = DEFAULT_RETRANSMITS_RINGING_INTERVAL;
+    private final int retransmitsRingingInterval;
 
     /**
      * Crates a CallSipImpl instance belonging to <tt>sourceProvider</tt> and
@@ -96,13 +95,21 @@ protected CallSipImpl(OperationSetBasicTelephonySipImpl parentOpSet)
 
         this.messageFactory = getProtocolProvider().getMessageFactory();
 
+        ConfigurationService cfg = SipActivator.getConfigurationService();
+        int retransmitsRingingInterval = DEFAULT_RETRANSMITS_RINGING_INTERVAL;
+
+        if (cfg != null)
+        {
+            retransmitsRingingInterval
+                = cfg.getInt(
+                        RETRANSMITS_RINGING_INTERVAL,
+                        retransmitsRingingInterval);
+        }
+        this.retransmitsRingingInterval = retransmitsRingingInterval;
+
         //let's add ourselves to the calls repo. we are doing it ourselves just
         //to make sure that no one ever forgets.
         parentOpSet.getActiveCallsRepository().addCall(this);
-
-        ConfigurationService cfg = SipActivator.getConfigurationService();
-        retransmitsRingingInterval = cfg.getInt(RETRANSMITS_RINGING_INTERVAL,
-                DEFAULT_RETRANSMITS_RINGING_INTERVAL);
     }
 
     /**

src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java

@@ -23,7 +23,6 @@
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.service.protocol.media.*;
 import net.java.sip.communicator.util.*;
-// disambiguates Contact
 
 /**
  * Implements all call management logic and exports basic telephony support by
@@ -2036,9 +2035,9 @@ private void assertRegistered()
         if(!protocolProvider.isRegistered())
         {
             throw new OperationFailedException(
-                "The protocol provider should be registered "
-                +"before placing an outgoing call.",
-                OperationFailedException.PROVIDER_NOT_REGISTERED);
+                    "The protocol provider should be registered before placing"
+                        + " an outgoing call.",
+                    OperationFailedException.PROVIDER_NOT_REGISTERED);
         }
     }