diff options
| author | Boris Grozev <boris@jitsi.org> | 2013-08-14 16:32:24 +0300 |
|---|---|---|
| committer | Boris Grozev <boris@jitsi.org> | 2013-08-14 16:42:11 +0300 |
| commit | 82d179512d455e27eb058a06577b1141426a0240 (patch) | |
| tree | be1d13a52305e982dbe031f3a48a24e544662781 /src | |
| parent | 9dd68e2322e0338f0d67c371e78fada61eca814a (diff) | |
| download | jitsi-82d179512d455e27eb058a06577b1141426a0240.zip jitsi-82d179512d455e27eb058a06577b1141426a0240.tar.gz jitsi-82d179512d455e27eb058a06577b1141426a0240.tar.bz2 | |
Fix an NPE if we try to generate conference-info for a CallPeer without a Call
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java b/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java index a2e91a3..7f4d344 100644 --- a/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java +++ b/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java @@ -1020,6 +1020,9 @@ public abstract class AbstractOperationSetTelephonyConferencing< confInfo.setEntity(getLocalEntity(callPeer)); Call call = callPeer.getCall(); + if (call == null) + return null; + List<CallPeer> conferenceCallPeers = CallConference.getCallPeers(call); confInfo.setUserCount( 1 /* the local peer/user */ + conferenceCallPeers.size()); |