Skip to content

Commit d1a26c2

Browse files
authored
Fix wrongly enable octo (#279)
* fix: Another workaround (for source-add). * fix: Fixes a typo.
1 parent 9d42377 commit d1a26c2

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/main/java/org/jitsi/jicofo/JitsiMeetConferenceImpl.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,8 +1549,11 @@ public XMPPError onAddSource(JingleSession jingleSession,
15491549
// TODO: how do we handle this? Re-invite?
15501550
}
15511551

1552-
propagateNewSourcesToOcto(
1553-
bridgeSession, sourcesToAdd, sourceGroupsToAdd);
1552+
if (bridgeSession != null)
1553+
{
1554+
propagateNewSourcesToOcto(
1555+
bridgeSession, sourcesToAdd, sourceGroupsToAdd);
1556+
}
15541557
}
15551558

15561559
propagateNewSources(participant, sourcesToAdd, sourceGroupsToAdd);

src/main/java/org/jitsi/jicofo/ParticipantChannelAllocator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ else if (!canceled)
206206
// Failed to invite
207207
logger.info(
208208
"Expiring " + address + " channels - no RESULT for "
209-
+ (reInvite ? "transport-replace" : "session-invite"));
209+
+ (reInvite ? "transport-replace" : "session-initiate"));
210210
expireChannels = true;
211211

212212
// TODO: let meetConference know that our Jingle session failed,

0 commit comments

Comments
 (0)