Check default settings for property.

1 files changed, 8 insertions, 1 deletions

diff --git a/src/net/java/sip/communicator/impl/certificate/CertificateVerificationServiceImpl.java b/src/net/java/sip/communicator/impl/certificate/CertificateVerificationServiceImpl.java
index 9f86694..33917a0 100644
--- a/src/net/java/sip/communicator/impl/certificate/CertificateVerificationServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/certificate/CertificateVerificationServiceImpl.java
@@ -1062,10 +1062,17 @@ public class CertificateVerificationServiceImpl
         public void checkServerTrusted(X509Certificate[] chain, String authType)
             throws CertificateException
         {
+            // check and default configurations for property
+            // if missing default is null - false
+            String defaultAlwaysTrustMode =
+                CertificateVerificationActivator.getResources()
+                    .getSettingsString(CertificateVerificationService
+                        .ALWAYS_TRUST_MODE_ENABLED_PROP_NAME);
+
             if(CertificateVerificationActivator.getConfigurationService()
                 .getBoolean(CertificateVerificationService
                     .ALWAYS_TRUST_MODE_ENABLED_PROP_NAME,
-                    false))
+                    Boolean.parseBoolean(defaultAlwaysTrustMode)))
             {
                 return;
             }