From 77e622416b2e3188cc7d3fcd0d85eef3e898a1f0 Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Wed, 11 Feb 2015 17:02:21 +0200 Subject: [PATCH] Fixes possible NPE when provider is not connected but listing operation sets. --- .../protocol/sip/OperationSetBasicTelephonySipImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java index e19cf3ce7..bce6628b3 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetBasicTelephonySipImpl.java @@ -1960,9 +1960,11 @@ public synchronized void answerCallPeer(CallPeer peer) public String toString() { return getClass().getSimpleName() + "-[dn=" - + protocolProvider.getOurDisplayName() + " addr=[" - + protocolProvider.getRegistrarConnection().getAddressOfRecord() - + "]"; + + protocolProvider.getOurDisplayName() + + (protocolProvider.getRegistrarConnection() != null ? + " addr=[" + protocolProvider.getRegistrarConnection() + .getAddressOfRecord() + "]" + : "]"); } /**