diff options
| author | damencho <damencho@jitsi.org> | 2015-07-28 14:09:16 -0500 |
|---|---|---|
| committer | damencho <damencho@jitsi.org> | 2015-07-28 14:49:36 -0500 |
| commit | dfe9388425dcdcad79194a52c76c2a4481d855c7 (patch) | |
| tree | cd917f606c9239d9b78566165c9673f524f720ad /src/net/java/sip/communicator/impl | |
| parent | fba5aeba1ebeaea1942d949fe588d053b044e28a (diff) | |
| download | jitsi-dfe9388425dcdcad79194a52c76c2a4481d855c7.zip jitsi-dfe9388425dcdcad79194a52c76c2a4481d855c7.tar.gz jitsi-dfe9388425dcdcad79194a52c76c2a4481d855c7.tar.bz2 | |
Fixes possible NPE when debug enabled and no ssl context available (fixes damencho/jigasi#12).
Diffstat (limited to 'src/net/java/sip/communicator/impl')
| -rw-r--r-- | src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java | 2 |
1 files changed, 1 insertions, 1 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 454616f..2ea5c9c 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java @@ -1157,7 +1157,7 @@ public class ProtocolProviderServiceJabberImpl getTrustManager(cvs, serviceName)); // log SSL/TLS algorithms and protocols - if (logger.isDebugEnabled()) + if (logger.isDebugEnabled() && sslContext != null) { final StringBuilder buff = new StringBuilder(); buff.append("Available TLS protocols and algorithms:\n"); |