From bbcbc5fdbdd8ef10ebe655879326d239bcc958ef Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Fri, 8 Oct 2010 12:35:07 +0000 Subject: [PATCH] On startup don't block account loading with dns queries (network maybe down). --- .../sip/ProtocolProviderServiceSipImpl.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java index 974de7583..db6756919 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java @@ -492,9 +492,13 @@ protected void initialize(String sipAddress, this.sipStatusEnum = new SipStatusEnum(protocolIconPath); + boolean isProxyValidated = + accountID.getAccountPropertyBoolean( + ProtocolProviderFactory.PROXY_ADDRESS_VALIDATED, false); //init the proxy, we had to have at least one address configured // so use it, if it fails later we will use next one - initOutboundProxy(accountID, 0); + if(!isProxyValidated) + initOutboundProxy(accountID, 0); //init proxy port int preferredSipPort = ListeningPoint.PORT_5060; @@ -558,8 +562,13 @@ protected void initialize(String sipAddress, ourDisplayName = accountID.getUserID(); } + boolean isServerValidated = + accountID.getAccountPropertyBoolean( + ProtocolProviderFactory.SERVER_ADDRESS_VALIDATED, false); + //create a connection with the registrar - initRegistrarConnection(accountID); + if(!isServerValidated) + initRegistrarConnection(accountID); //init our call processor OperationSetBasicTelephonySipImpl opSetBasicTelephonySipImpl