From d1a26c2225582160346a4706b9508b84a570e454 Mon Sep 17 00:00:00 2001 From: bgrozev Date: Tue, 24 Apr 2018 17:57:12 -0500 Subject: [PATCH] Fix wrongly enable octo (#279) * fix: Another workaround (for source-add). * fix: Fixes a typo. --- .../java/org/jitsi/jicofo/JitsiMeetConferenceImpl.java | 7 +++++-- .../java/org/jitsi/jicofo/ParticipantChannelAllocator.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/jitsi/jicofo/JitsiMeetConferenceImpl.java b/src/main/java/org/jitsi/jicofo/JitsiMeetConferenceImpl.java index d1635732b0..5e1a547c91 100644 --- a/src/main/java/org/jitsi/jicofo/JitsiMeetConferenceImpl.java +++ b/src/main/java/org/jitsi/jicofo/JitsiMeetConferenceImpl.java @@ -1549,8 +1549,11 @@ public XMPPError onAddSource(JingleSession jingleSession, // TODO: how do we handle this? Re-invite? } - propagateNewSourcesToOcto( - bridgeSession, sourcesToAdd, sourceGroupsToAdd); + if (bridgeSession != null) + { + propagateNewSourcesToOcto( + bridgeSession, sourcesToAdd, sourceGroupsToAdd); + } } propagateNewSources(participant, sourcesToAdd, sourceGroupsToAdd); diff --git a/src/main/java/org/jitsi/jicofo/ParticipantChannelAllocator.java b/src/main/java/org/jitsi/jicofo/ParticipantChannelAllocator.java index ac8788338e..d6ae48ebcc 100644 --- a/src/main/java/org/jitsi/jicofo/ParticipantChannelAllocator.java +++ b/src/main/java/org/jitsi/jicofo/ParticipantChannelAllocator.java @@ -206,7 +206,7 @@ else if (!canceled) // Failed to invite logger.info( "Expiring " + address + " channels - no RESULT for " - + (reInvite ? "transport-replace" : "session-invite")); + + (reInvite ? "transport-replace" : "session-initiate")); expireChannels = true; // TODO: let meetConference know that our Jingle session failed,