Fix wrongly enable octo (#279)

* fix: Another workaround (for source-add). * fix: Fixes a typo.
jitsi · Apr 24, 2018 · d1a26c2 · d1a26c2
1 parent 9d42377
commit d1a26c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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,