diff options
| author | Boris Grozev <boris@jitsi.org> | 2013-08-15 11:44:41 +0300 |
|---|---|---|
| committer | Boris Grozev <boris@jitsi.org> | 2013-08-15 11:44:41 +0300 |
| commit | 4d870d6b21e324ce743b0aabde2ba80e630dadf7 (patch) | |
| tree | eea0be9597ba78f8e74d43fbd84e6e7b426bb9c1 /src/net/java/sip/communicator/impl/protocol | |
| parent | 82d179512d455e27eb058a06577b1141426a0240 (diff) | |
| download | jitsi-4d870d6b21e324ce743b0aabde2ba80e630dadf7.zip jitsi-4d870d6b21e324ce743b0aabde2ba80e630dadf7.tar.gz jitsi-4d870d6b21e324ce743b0aabde2ba80e630dadf7.tar.bz2 | |
Fixes a couple of NPEs
Diffstat (limited to 'src/net/java/sip/communicator/impl/protocol')
| -rw-r--r-- | src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java index 663de4b..d75ac0a 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java @@ -464,7 +464,8 @@ public class OperationSetTelephonyConferencingJabberImpl ConferenceInfoDocument confInfo = super.getCurrentConferenceInfo(callPeer); - if (callPeer instanceof CallPeerJabberImpl) + if (callPeer instanceof CallPeerJabberImpl + && confInfo != null) { confInfo.setSid(((CallPeerJabberImpl)callPeer).getSID()); } |