From 176fe3587016a5b04de0cd0080264c444040ffad Mon Sep 17 00:00:00 2001 From: Boris Grozev Date: Sat, 22 Jun 2013 10:13:19 +0300 Subject: Small bug fixes --- .../jabber/OperationSetTelephonyConferencingJabberImpl.java | 8 ++++++-- .../protocol/media/AbstractOperationSetTelephonyConferencing.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/net/java/sip/communicator') 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 5e55615..6da2fe6 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java @@ -171,8 +171,12 @@ public class OperationSetTelephonyConferencingJabberImpl ConferenceInfoDocument lastSentConfInfo = callPeerJabber.getLastConferenceInfoSent(); - ConferenceInfoDocument diff - = getConferenceInfoDiff(lastSentConfInfo, currentConfInfo); + ConferenceInfoDocument diff; + + if (lastSentConfInfo == null) + diff = currentConfInfo; + else + diff = getConferenceInfoDiff(lastSentConfInfo, currentConfInfo); if (diff != null) { 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 e47b25b..1f4c9cd 100644 --- a/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java +++ b/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java @@ -1326,7 +1326,7 @@ public abstract class AbstractOperationSetTelephonyConferencing< throw new IllegalArgumentException("The 'b' document needs to" + "have state=full"); - if (stringsMatch(a.getEntity(), b.getEntity())) + if (!stringsMatch(a.getEntity(), b.getEntity())) return false; else if (a.getUserCount() != b.getUserCount()) return false; -- cgit v1.1